Skip to content

fix: TTA-29 Selecting multiple time entries and show total of hours o… #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 18, 2022
Merged

fix: TTA-29 Selecting multiple time entries and show total of hours o… #896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
835d03c
fix: TTA-29 Selecting multiple time entries and show total of hours o…
wilc0519 Jul 4, 2022
d6c4865
refactor test TimeEntriesTableComponent
wilc0519 Jul 5, 2022
a46002d
Refactor sumHoursEntriesSelected
wilc0519 Jul 6, 2022
e49cc43
resolved conflicts
wilc0519 Jul 18, 2022
68cdc69
resolved conflicts
wilc0519 Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor test TimeEntriesTableComponent
  • Loading branch information
@wilc0519
wilc0519 committed Jul 5, 2022
commit d6c48658e28a13d253ac7e06e1a7965831f99e9c
7 changes: 3 additions & 4 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('Reports Page', () => {
let fixture: ComponentFixture<TimeEntriesTableComponent>;
let store: MockStore<EntryState>;
let getReportDataSourceSelectorMock;
let getResultSumEntriesSelectedMock;
let durationTime: number;
let row: number;
let node: number;
Expand Down Expand Up @@ -96,8 +95,8 @@ describe('Reports Page', () => {
component = fixture.componentInstance;
store = TestBed.inject(MockStore);
store.setState(state);
getReportDataSourceSelectorMock = store.overrideSelector(getReportDataSource, state.reportDataSource);
getResultSumEntriesSelectedMock = store.overrideSelector(getResultSumEntriesSelected, state.resultSumEntriesSelected);
getReportDataSourceSelectorMock = (store.overrideSelector(getReportDataSource, state.reportDataSource),
store.overrideSelector(getResultSumEntriesSelected, state.resultSumEntriesSelected));
fixture.detectChanges();
}
);
Expand Down Expand Up @@ -212,7 +211,7 @@ describe('Reports Page', () => {

it('the sume of hours of entries selected is equal to {hours:0, minutes:0, seconds:0}', () => {
let checked = true;
let{hours, minutes, seconds}:TotalHours = component.sumHoursEntriesSelected(timeEntryList[0], checked);
let {hours, minutes, seconds}:TotalHours = component.sumHoursEntriesSelected(timeEntryList[0], checked);
checked = false;
({hours, minutes,seconds} = component.sumHoursEntriesSelected(timeEntryList[0], checked));
expect({hours, minutes, seconds}).toEqual({hours:0, minutes:0, seconds:0});
Expand Down
14 changes: 0 additions & 14 deletions src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,20 +715,6 @@ describe('DetailsFieldsComponent', () => {
expect(component.entryForm.value.project_name).toBe('name');
});

it('it calls the close method if opened equals true', () => {
const datepicker: any = { opened : true, open : () => ({}), close : () => ({}) };
spyOn(datepicker, 'close');
component.openOrCloseDatePicker(datepicker);
expect(datepicker.close).toHaveBeenCalled();
});

it('it calls the open method if opened equals false', () => {
const datepicker: any = { opened : false, open : () => ({}), close : () => ({}) };
spyOn(datepicker, 'open');
component.openOrCloseDatePicker(datepicker);
expect(datepicker.open).toHaveBeenCalled();
});

/*
TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component,
and now these couple of tests are failing. A solution to this error might be generate a Test Wrapper Component. More details here:
Expand Down