Skip to content

TT-103 test: Fix moment flaky tests #600

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 1 commit into from
Dec 31, 2020
Merged

TT-103 test: Fix moment flaky tests #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 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 @@ -77,6 +77,8 @@ describe('DetailsFieldsComponent', () => {
technology: '',
};

const mockCurrentDate = '2020-12-01T12:00:00';

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DetailsFieldsComponent, TechnologiesComponent],
Expand Down Expand Up @@ -343,14 +345,12 @@ describe('DetailsFieldsComponent', () => {
});

it('should modify the start_date when start_hour has been modified', () => {
const currentDate = moment().format('YYYY-MM-DD');
const startHour = moment().format('HH:mm:ss');
const startDate = new Date(`${currentDate}T${startHour.trim()}`);
const startDate = new Date(mockCurrentDate);

component.entryToEdit = {...entryToEdit, start_date: startDate };
fixture.componentInstance.ngOnChanges();

const updatedStartDate = moment().subtract(1, 'hours');
const updatedStartDate = moment(startDate).subtract(1, 'hours');
const updatedStartHour = updatedStartDate.format('HH:mm');
component.entryForm.patchValue({start_hour: updatedStartHour});

Expand All @@ -372,14 +372,12 @@ describe('DetailsFieldsComponent', () => {
});

it('should modify the end_date when end_hour has been modified', () => {
const currentDate = moment().format('YYYY-MM-DD');
const endHour = moment().format('HH:mm:ss');
const endDate = new Date(`${currentDate}T${endHour.trim()}`);
const endDate = new Date(mockCurrentDate);

component.entryToEdit = {...entryToEdit, end_date: endDate };
fixture.componentInstance.ngOnChanges();

const updatedEndDate = moment().subtract(1, 'hours');
const updatedEndDate = moment(endDate).subtract(1, 'hours');
const updatedEndHour = updatedEndDate.format('HH:mm');
component.entryForm.patchValue({end_hour: updatedEndHour});

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/shared/components/month-picker/month-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('MonthPickerComponent', () => {
const year = new Date().getFullYear();

spyOn(component.dateSelected, 'emit');
expect(component.dateSelected.emit({ monthIndex: month, year: year }));
expect(component.dateSelected.emit({ monthIndex: month, year }));
});


Expand Down
52 changes: 31 additions & 21 deletions src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ describe('EntryFieldsComponent', () => {
error: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { },
warning: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { }
};
const lastDate = moment().format('YYYY-MM-DD');
const startHourTest = moment().subtract(5, 'hours').format('HH:mm:ss');
const endHourTest = moment().subtract(3, 'hours').format('HH:mm:ss');
const mockDate = '2020-12-01T12:00:00';
const lastDate = moment(mockDate).format(DATE_FORMAT_YEAR);
const startHourTest = moment(mockDate).subtract(5, 'hours').format('HH:mm:ss');
const endHourTest = moment(mockDate).subtract(3, 'hours').format('HH:mm:ss');
const lastStartHourEntryEntered = new Date(`${lastDate}T${startHourTest.trim()}`).toISOString();
const lastEndHourEntryEntered = new Date(`${lastDate}T${endHourTest.trim()}`).toISOString();

Expand Down Expand Up @@ -95,8 +96,8 @@ describe('EntryFieldsComponent', () => {
project_id: 'project-id-15',
description: 'description for active entry',
uri: 'abc',
start_date : moment().format(DATE_FORMAT_YEAR),
start_hour : moment().format('HH:mm'),
start_date : moment(mockDate).format(DATE_FORMAT_YEAR),
start_hour : moment(mockDate).format('HH:mm'),
};

beforeEach(waitForAsync(() => {
Expand Down Expand Up @@ -144,16 +145,20 @@ describe('EntryFieldsComponent', () => {
uri: entryDataForm.uri,
activity_id: entryDataForm.activity_id,
start_hour: formatDate(entry.start_date, 'HH:mm', 'en'),
start_date : moment().format(DATE_FORMAT_YEAR),
start_date : moment(mockDate).format(DATE_FORMAT_YEAR),
}
);
expect(component.selectedTechnologies).toEqual([]);
});

it('displays error message when the date selected is in the future', () => {
component.newData = entry;
component.activeEntry = entry ;
component.setDataToUpdate(entry);
const mockEntry = { ...entry,
start_date : moment().format(DATE_FORMAT_YEAR),
start_hour : moment().format('HH:mm')
};
component.newData = mockEntry;
component.activeEntry = mockEntry ;
component.setDataToUpdate(mockEntry);
spyOn(toastrServiceStub, 'error');

const hourInTheFuture = moment().add(1, 'hours').format('HH:mm');
Expand All @@ -170,7 +175,7 @@ describe('EntryFieldsComponent', () => {
component.setDataToUpdate(entry);
spyOn(toastrServiceStub, 'error');

const hourInThePast = moment().subtract(6, 'hour').format('HH:mm');
const hourInThePast = moment(mockDate).subtract(6, 'hour').format('HH:mm');
component.entryForm.patchValue({ start_hour : hourInThePast});
component.onUpdateStartHour();

Expand All @@ -188,7 +193,7 @@ describe('EntryFieldsComponent', () => {
component.newData = entry;
component.activeEntry = entry ;
component.setDataToUpdate(entry);
const updatedTime = moment().format('HH:mm');
const updatedTime = moment(mockDate).format('HH:mm');
component.entryForm.patchValue({ start_hour : updatedTime});
spyOn(component.entryForm, 'patchValue');
component.cancelTimeInUpdate();
Expand All @@ -206,7 +211,7 @@ describe('EntryFieldsComponent', () => {
component.activeEntry = entry ;
component.setDataToUpdate(entry);

const updatedTime = moment().subtract(6, 'hours').format('HH:mm');
const updatedTime = moment(mockDate).subtract(6, 'hours').format('HH:mm');
component.entryForm.patchValue({ start_hour : updatedTime});

spyOn(component.entryForm, 'patchValue');
Expand All @@ -221,9 +226,13 @@ describe('EntryFieldsComponent', () => {
});

it('If start hour is in the future, reset to initial start_date in form', () => {
component.newData = entry;
component.activeEntry = entry ;
component.setDataToUpdate(entry);
const mockEntry = { ...entry,
start_date : moment().format(DATE_FORMAT_YEAR),
start_hour : moment().format('HH:mm')
};
component.newData = mockEntry;
component.activeEntry = mockEntry;
component.setDataToUpdate(mockEntry);

const hourInTheFuture = moment().add(1, 'hours').format('HH:mm');
component.entryForm.patchValue({ start_hour : hourInTheFuture});
Expand All @@ -240,9 +249,10 @@ describe('EntryFieldsComponent', () => {
});

it('when a start hour is updated, then dispatch UpdateActiveEntry', () => {
component.activeEntry = entry ;
component.activeEntry = entry;
component.setDataToUpdate(entry);
const updatedTime = moment().format('HH:mm');
const updatedTime = moment(mockDate).format('HH:mm');

component.entryForm.patchValue({ start_hour : updatedTime});
spyOn(store, 'dispatch');

Expand All @@ -252,9 +262,9 @@ describe('EntryFieldsComponent', () => {
});

it('When start_time is updated, component.last_entry is equal to time entry in the position 1', waitForAsync(() => {
component.activeEntry = entry ;
component.activeEntry = entry;
component.setDataToUpdate(entry);
const updatedTime = moment().format('HH:mm');
const updatedTime = moment(mockDate).format('HH:mm');

component.entryForm.patchValue({ start_hour : updatedTime});
component.onUpdateStartHour();
Expand All @@ -263,9 +273,9 @@ describe('EntryFieldsComponent', () => {
}));

it('When start_time is updated for a time entry. UpdateCurrentOrLastEntry action is dispatched', () => {
component.activeEntry = entry ;
component.activeEntry = entry;
component.setDataToUpdate(entry);
const updatedTime = moment().subtract(4, 'hours').format('HH:mm');
const updatedTime = moment(mockDate).subtract(4, 'hours').format('HH:mm');
component.entryForm.patchValue({ start_hour : updatedTime});
spyOn(store, 'dispatch');

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/time-entries/pages/time-entries.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ describe('TimeEntriesComponent', () => {
const year = new Date().getFullYear();

spyOn(store, 'dispatch');
component.dateSelected({monthIndex: month, year: year});
component.dateSelected({ monthIndex: month, year });
expect(store.dispatch).toHaveBeenCalledWith(new entryActions.LoadEntries(month + 1, year));
});

Expand Down