fix: #571 test coverage

Author: scastillo-jp

package-lock.json

@@ -21,13 +21,13 @@
     "@angular/platform-browser": "~10.2.2",
     "@angular/platform-browser-dynamic": "~10.2.2",
     "@angular/router": "~10.2.2",
-    "@azure/app-configuration": "^1.1.0",
-    "@azure/identity": "^1.1.0",
     "@ngrx/effects": "^10.0.1",
     "@ngrx/store": "^10.0.1",
     "@ngrx/store-devtools": "^10.0.1",
     "@types/datatables.net-buttons": "^1.4.3",
     "angular-datatables": "^9.0.2",
+    "@azure/app-configuration": "^1.1.0",
+    "@azure/identity": "^1.1.0",
     "bootstrap": "^4.4.1",
     "datatables.net": "^1.10.21",
     "datatables.net-buttons": "^1.6.2",

package.json

@@ -48,7 +48,6 @@ describe('Reports Page', () => {
         providers: [provideMockStore({ initialState: state })],
       }).compileComponents();
       store = TestBed.inject(MockStore);
-
     }));
 
     beforeEach(waitForAsync(() => {

src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts

@@ -2,6 +2,7 @@ import { ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { DATE_FORMAT } from 'src/environments/environment';
 import * as entryActions from '../../../time-clock/store/entry.actions';
 import {Store} from '@ngrx/store';
 import {EntryState} from '../../../time-clock/store/entry.reducer';
@@ -28,8 +29,8 @@ export class TimeRangeFormComponent implements OnInit {
 
   setInitialDataOnScreen() {
     this.reportForm.setValue({
-      startDate: formatDate(moment().startOf('week').toString(), 'yyyy-MM-dd', 'en'),
-      endDate: formatDate(moment().endOf('week').toString(), 'yyyy-MM-dd', 'en')
+      startDate: formatDate(moment().startOf('week').toString(), DATE_FORMAT, 'en'),
+      endDate: formatDate(moment().endOf('week').toString(), DATE_FORMAT, 'en')
     });
     this.onSubmit();
   }

src/app/modules/reports/components/time-range-form/time-range-form.component.ts

@@ -23,7 +23,7 @@ describe('ReportsComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should have form and datatable components', async(() => {
+  it('should have form and datatable components', waitForAsync(() => {
     fixture.detectChanges();
 
     const compile = fixture.debugElement.nativeElement;

src/app/modules/reports/pages/reports.component.spec.ts

@@ -18,7 +18,8 @@ import { TechnologiesComponent } from './../technologies/technologies.component'
 import { DetailsFieldsComponent } from './details-fields.component';
 import { ProjectSelectedEvent } from './project-selected-event';
 import { SaveEntryEvent } from './save-entry-event';
-
+import { DATE_FORMAT } from 'src/environments/environment';
+import { DATE_FORMAT_YEAR } from 'src/environments/environment';
 
 describe('DetailsFieldsComponent', () => {
   type Merged = TechnologyState & ProjectState & EntryState;
@@ -66,8 +67,8 @@ describe('DetailsFieldsComponent', () => {
     project_name: '',
     activity_id: '',
     uri: '',
-    start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
-    end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+    start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
+    end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
     start_hour: '00:00:00',
     end_hour: '00:00:00',
     description: '',
@@ -178,8 +179,8 @@ describe('DetailsFieldsComponent', () => {
       project_name: '',
       activity_id: '',
       uri: '',
-      start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
-      end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+      start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
+      end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
       start_hour: '00:00:00',
       end_hour: '00:00:00',
       description: '',
@@ -314,7 +315,7 @@ describe('DetailsFieldsComponent', () => {
   it('displays error message when the date selected is in the future', () => {
     spyOn(toastrServiceStub, 'error');
 
-    const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
+    const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
     component.entryForm.setValue({ ...formValues, start_date: futureDate, end_date: futureDate });
     component.onSubmit();
 
@@ -324,8 +325,8 @@ describe('DetailsFieldsComponent', () => {
   it('when start_date is in the future and end_date is OK then throws an error', () => {
     spyOn(toastrServiceStub, 'error');
 
-    const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
-    const currentDate = moment().format('YYYY-MM-DD');
+    const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
+    const currentDate = moment().format(DATE_FORMAT_YEAR);
     component.entryForm.setValue({ ...formValues, start_date: futureDate, end_date: currentDate });
     component.onSubmit();
 
@@ -335,8 +336,8 @@ describe('DetailsFieldsComponent', () => {
   it('when start_date is OK and end_date is in the future then throws an error future', () => {
     spyOn(toastrServiceStub, 'error');
 
-    const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
-    const currentDate = moment().format('YYYY-MM-DD');
+    const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
+    const currentDate = moment().format(DATE_FORMAT_YEAR);
     component.entryForm.setValue({ ...formValues, start_date: currentDate, end_date: futureDate });
     component.onSubmit();
 

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

@@ -18,6 +18,7 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
 import { SaveEntryEvent } from './save-entry-event';
 import { ProjectSelectedEvent } from './project-selected-event';
 import { get } from 'lodash';
+import { DATE_FORMAT } from 'src/environments/environment';
 
 
 type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@@ -131,8 +132,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
         project_id: this.entryToEdit.project_id,
         activity_id: this.entryToEdit.activity_id,
         description: this.entryToEdit.description,
-        start_date: formatDate(get(this.entryToEdit, 'start_date', '') , 'yyyy-MM-dd', 'en'),
-        end_date: formatDate(get(this.entryToEdit, 'end_date'), 'yyyy-MM-dd', 'en'),
+        start_date: formatDate(get(this.entryToEdit, 'start_date', '') , DATE_FORMAT, 'en'),
+        end_date: formatDate(get(this.entryToEdit, 'end_date'), DATE_FORMAT, 'en'),
         start_hour: formatDate(get(this.entryToEdit, 'start_date', '00:00:00'), 'HH:mm:ss', 'en'),
         end_hour: formatDate(get(this.entryToEdit, 'end_date', '00:00:00'), 'HH:mm:ss', 'en'),
         uri: this.entryToEdit.uri,
@@ -150,8 +151,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
       project_id: '',
       activity_id: '',
       description: '',
-      start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
-      end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+      start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
+      end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
       start_hour: '00:00:00',
       end_hour: '00:00:00',
       uri: '',

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

@@ -1,4 +1,4 @@
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {waitForAsync, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {InputDateComponent} from './input-date.component';
 
 describe('InputDateComponent', () => {

src/app/modules/shared/components/input-date/input-date.component.spec.ts

@@ -1,5 +1,5 @@
 import {AzureAdB2CService} from 'src/app/modules/login/services/azure.ad.b2c.service';
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {SidebarComponent} from './sidebar.component';
 import {RouterTestingModule} from '@angular/router/testing';
@@ -56,7 +56,7 @@ describe('SidebarComponent', () => {
     component.getSidebarItems();
     const menuItems = component.itemsSidebar;
 
-    expect(menuItems.length).toBe(6);
+    expect(menuItems.length).toBe(7);
   });
 
   it('non admin users have two menu items', () => {

src/app/modules/shared/components/sidebar/sidebar.component.spec.ts

@@ -1,4 +1,4 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
 import {MockStore, provideMockStore} from '@ngrx/store/testing';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';