Skip to content

Commit ca8c14a

Browse files
scastillo-jpGuido Quezada
authored andcommitted
fix: #571 test coverage
1 parent 926417b commit ca8c14a

27 files changed

+198
-461
lines changed

package-lock.json

Lines changed: 23 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"@angular/platform-browser": "~10.2.2",
2222
"@angular/platform-browser-dynamic": "~10.2.2",
2323
"@angular/router": "~10.2.2",
24-
"@azure/app-configuration": "^1.1.0",
25-
"@azure/identity": "^1.1.0",
2624
"@ngrx/effects": "^10.0.1",
2725
"@ngrx/store": "^10.0.1",
2826
"@ngrx/store-devtools": "^10.0.1",
2927
"@types/datatables.net-buttons": "^1.4.3",
3028
"angular-datatables": "^9.0.2",
29+
"@azure/app-configuration": "^1.1.0",
30+
"@azure/identity": "^1.1.0",
3131
"bootstrap": "^4.4.1",
3232
"datatables.net": "^1.10.21",
3333
"datatables.net-buttons": "^1.6.2",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ describe('Reports Page', () => {
4848
providers: [provideMockStore({ initialState: state })],
4949
}).compileComponents();
5050
store = TestBed.inject(MockStore);
51-
5251
}));
5352

5453
beforeEach(waitForAsync(() => {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { ToastrService } from 'ngx-toastr';
22
import { formatDate } from '@angular/common';
33
import { Component, OnInit } from '@angular/core';
44
import { FormControl, FormGroup } from '@angular/forms';
5+
import { DATE_FORMAT } from 'src/environments/environment';
56
import * as entryActions from '../../../time-clock/store/entry.actions';
67
import {Store} from '@ngrx/store';
78
import {EntryState} from '../../../time-clock/store/entry.reducer';
@@ -28,8 +29,8 @@ export class TimeRangeFormComponent implements OnInit {
2829

2930
setInitialDataOnScreen() {
3031
this.reportForm.setValue({
31-
startDate: formatDate(moment().startOf('week').toString(), 'yyyy-MM-dd', 'en'),
32-
endDate: formatDate(moment().endOf('week').toString(), 'yyyy-MM-dd', 'en')
32+
startDate: formatDate(moment().startOf('week').toString(), DATE_FORMAT, 'en'),
33+
endDate: formatDate(moment().endOf('week').toString(), DATE_FORMAT, 'en')
3334
});
3435
this.onSubmit();
3536
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('ReportsComponent', () => {
2323
expect(component).toBeTruthy();
2424
});
2525

26-
it('should have form and datatable components', async(() => {
26+
it('should have form and datatable components', waitForAsync(() => {
2727
fixture.detectChanges();
2828

2929
const compile = fixture.debugElement.nativeElement;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import { TechnologiesComponent } from './../technologies/technologies.component'
1818
import { DetailsFieldsComponent } from './details-fields.component';
1919
import { ProjectSelectedEvent } from './project-selected-event';
2020
import { SaveEntryEvent } from './save-entry-event';
21-
21+
import { DATE_FORMAT } from 'src/environments/environment';
22+
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
2223

2324
describe('DetailsFieldsComponent', () => {
2425
type Merged = TechnologyState & ProjectState & EntryState;
@@ -66,7 +67,7 @@ describe('DetailsFieldsComponent', () => {
6667
project_name: '',
6768
activity_id: '',
6869
uri: '',
69-
entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
70+
entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
7071
start_hour: '00:00:00',
7172
end_hour: '00:00:00',
7273
description: '',
@@ -176,7 +177,7 @@ describe('DetailsFieldsComponent', () => {
176177
project_name: '',
177178
activity_id: '',
178179
uri: '',
179-
entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
180+
entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
180181
start_hour: '00:00:00',
181182
end_hour: '00:00:00',
182183
description: '',
@@ -310,7 +311,7 @@ describe('DetailsFieldsComponent', () => {
310311
it('displays error message when the date selected is in the future', () => {
311312
spyOn(toastrServiceStub, 'error');
312313

313-
const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
314+
const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
314315
component.entryForm.setValue({ ...formValues, entry_date: futureDate });
315316
component.onSubmit();
316317

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { TechnologyState } from '../../store/technology.reducers';
1717
import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
1818
import { SaveEntryEvent } from './save-entry-event';
1919
import { ProjectSelectedEvent } from './project-selected-event';
20+
import { DATE_FORMAT } from 'src/environments/environment';
2021

2122

2223
type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@@ -129,7 +130,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
129130
project_id: this.entryToEdit.project_id,
130131
activity_id: this.entryToEdit.activity_id,
131132
description: this.entryToEdit.description,
132-
entry_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'yyyy-MM-dd', 'en') : '',
133+
entry_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, DATE_FORMAT, 'en') : '',
133134
start_hour: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'HH:mm:ss', 'en') : '00:00:00',
134135
end_hour: this.entryToEdit.end_date ? formatDate(this.entryToEdit.end_date, 'HH:mm:ss', 'en') : '00:00:00',
135136
uri: this.entryToEdit.uri,
@@ -147,7 +148,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
147148
project_id: '',
148149
activity_id: '',
149150
description: '',
150-
entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
151+
entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
151152
start_hour: '00:00:00',
152153
end_hour: '00:00:00',
153154
uri: '',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
1+
import {waitForAsync, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
22
import {InputDateComponent} from './input-date.component';
33

44
describe('InputDateComponent', () => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {AzureAdB2CService} from 'src/app/modules/login/services/azure.ad.b2c.service';
2-
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
2+
import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
33

44
import {SidebarComponent} from './sidebar.component';
55
import {RouterTestingModule} from '@angular/router/testing';
@@ -56,7 +56,7 @@ describe('SidebarComponent', () => {
5656
component.getSidebarItems();
5757
const menuItems = component.itemsSidebar;
5858

59-
expect(menuItems.length).toBe(6);
59+
expect(menuItems.length).toBe(7);
6060
});
6161

6262
it('non admin users have two menu items', () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
1+
import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {MockStore, provideMockStore} from '@ngrx/store/testing';
33
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
44

0 commit comments

Comments
 (0)