Merge branch 'master' into TT-208-don't-allow-deleting-activities

src/app/modules/shared/components/details-fields/details-fields.component.spec.ts

@@ -518,10 +518,9 @@ describe('DetailsFieldsComponent', () => {
 
   it('on the input with id #start_date we could get the id and max value', () => {
     fixture.detectChanges();
-    const expectedDate = new Date().toISOString().split('T')[0];
+    const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
     const startDateInput: HTMLInputElement = fixture.debugElement.
-      nativeElement.querySelector(`input[id="start_date"],input[max="${component.getCurrentDate()}"]`);
-
+     nativeElement.querySelector(`input[id="start_date"],input[max="${component.getCurrentDate()}"]`);
     expect(startDateInput.id).toEqual('start_date');
     expect(startDateInput.max).toEqual(expectedDate);
   });
@@ -535,6 +534,37 @@ describe('DetailsFieldsComponent', () => {
     expect(endDateInput.max).toEqual(expectedDate);
   });
 
+  const diffParams = [
+    {
+      case: 'positive should return correctly diff',
+      entryDates: {
+        start_date: '2021-04-15',
+        end_date: '2021-04-15',
+        start_hour: '18:05',
+        end_hour: '19:00',
+      },
+      expectedTimeDiff: '00:55',
+    },
+    {
+      case: 'negative should return 00:00',
+      entryDates: {
+        start_date: '2021-04-15',
+        end_date: '2021-04-14',
+        start_hour: '18:05',
+        end_hour: '17:00',
+      },
+      expectedTimeDiff: '00:00',
+    },
+  ];
+  diffParams.map((param) => {
+    it(`if [start_date, start_hour] and [end_date, end_hour] diff is ${param.case}`, () => {
+      component.entryForm.setValue({ ...formValues, ...param.entryDates });
+      const timeDiff = component.getTimeDifference();
+
+      expect(timeDiff).toBe(param.expectedTimeDiff);
+    });
+  });
+
   it('should find an activity with given id & status: inactive', () => {
 
     const expectedActivity = { id: 'fc5fab41-a21e-4155-9d05-511b956ebd08', tenant_id: 'ioet_2', deleted: null, name: 'ghi', status: 'inactive' };
@@ -545,6 +575,7 @@ describe('DetailsFieldsComponent', () => {
     const foundActivity = component.findInactiveActivity(state.activities.data);
     expect(foundActivity).toEqual(expectedActivity);
   });
+
   /*
    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:

src/app/modules/shared/components/details-fields/details-fields.component.ts

@@ -20,6 +20,7 @@ import { ProjectSelectedEvent } from './project-selected-event';
 import { get } from 'lodash';
 import { DATE_FORMAT, DATE_FORMAT_YEAR } from 'src/environments/environment';
 import { TechnologiesComponent } from '../technologies/technologies.component';
+import { MatDatepicker } from '@angular/material/datepicker';
 import { Observable } from 'rxjs';
 
 type Merged = TechnologyState & ProjectState & ActivityState & EntryState;

src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts

@@ -456,11 +456,9 @@ describe('EntryFieldsComponent', () => {
   it('when FT "update-entries" disable for the user,the UpdateCurrentOrLastEntry function is called to update the entries', () => {
     spyOn(featureToggleGeneralService, 'isActivated').and.returnValue(of(false));
 
-    const mockEntry = {
-      ...entry,
-      start_date: moment().format(DATE_FORMAT_YEAR),
-      start_hour: moment().format('HH:mm'),
-      update_last_entry_if_overlap: false
+    const mockEntry = { ...entry,
+      start_date : moment().format(DATE_FORMAT_YEAR),
+      start_hour : moment().format('HH:mm')
     };
     component.newData = mockEntry;
     featureToggleGeneralService.isActivated(FeatureToggle.UPDATE_ENTRIES).subscribe(() => {