Skip to content

Commit ed579b6

Browse files
scastillo-jpAngeluz-07
authored andcommitted
fix: #571 test coverage
1 parent 2170c89 commit ed579b6

24 files changed

+195
-467
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/shared/components/details-fields/details-fields.component.spec.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import { ProjectSelectedEvent } from './project-selected-event';
2020
import { SaveEntryEvent } from './save-entry-event';
2121
import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
2222

23+
import { DATE_FORMAT } from 'src/environments/environment';
24+
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
2325

2426
describe('DetailsFieldsComponent', () => {
2527
type Merged = TechnologyState & ProjectState & EntryState;
@@ -67,8 +69,8 @@ describe('DetailsFieldsComponent', () => {
6769
project_name: '',
6870
activity_id: '',
6971
uri: '',
70-
start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
71-
end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
72+
start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
73+
end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
7274
start_hour: '00:00',
7375
end_hour: '00:00',
7476
description: '',
@@ -179,8 +181,8 @@ describe('DetailsFieldsComponent', () => {
179181
project_name: '',
180182
activity_id: '',
181183
uri: '',
182-
start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
183-
end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
184+
start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
185+
end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
184186
start_hour: '00:00',
185187
end_hour: '00:00',
186188
description: '',
@@ -315,7 +317,7 @@ describe('DetailsFieldsComponent', () => {
315317
it('displays error message when the date selected is in the future', () => {
316318
spyOn(toastrServiceStub, 'error');
317319

318-
const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
320+
const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
319321
component.entryForm.setValue({ ...formValues, start_date: futureDate, end_date: futureDate });
320322
component.onSubmit();
321323

@@ -325,8 +327,8 @@ describe('DetailsFieldsComponent', () => {
325327
it('when start_date is in the future and end_date is OK then throws an error', () => {
326328
spyOn(toastrServiceStub, 'error');
327329

328-
const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
329-
const currentDate = moment().format('YYYY-MM-DD');
330+
const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
331+
const currentDate = moment().format(DATE_FORMAT_YEAR);
330332
component.entryForm.setValue({ ...formValues, start_date: futureDate, end_date: currentDate });
331333
component.onSubmit();
332334

@@ -336,8 +338,8 @@ describe('DetailsFieldsComponent', () => {
336338
it('when start_date is OK and end_date is in the future then throws an error future', () => {
337339
spyOn(toastrServiceStub, 'error');
338340

339-
const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
340-
const currentDate = moment().format('YYYY-MM-DD');
341+
const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
342+
const currentDate = moment().format(DATE_FORMAT_YEAR);
341343
component.entryForm.setValue({ ...formValues, start_date: currentDate, end_date: futureDate });
342344
component.onSubmit();
343345

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
1818
import { SaveEntryEvent } from './save-entry-event';
1919
import { ProjectSelectedEvent } from './project-selected-event';
2020
import { get } from 'lodash';
21+
import { DATE_FORMAT } from 'src/environments/environment';
2122

2223

2324
type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@@ -131,8 +132,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
131132
project_id: this.entryToEdit.project_id,
132133
activity_id: this.entryToEdit.activity_id,
133134
description: this.entryToEdit.description,
134-
start_date: formatDate(get(this.entryToEdit, 'start_date', '') , 'yyyy-MM-dd', 'en'),
135-
end_date: formatDate(get(this.entryToEdit, 'end_date'), 'yyyy-MM-dd', 'en'),
135+
start_date: formatDate(get(this.entryToEdit, 'start_date', '') ,DATE_FORMAT, 'en'),
136+
end_date: formatDate(get(this.entryToEdit, 'end_date'), DATE_FORMAT, 'en'),
136137
start_hour: formatDate(get(this.entryToEdit, 'start_date', '00:00'), 'HH:mm', 'en'),
137138
end_hour: formatDate(get(this.entryToEdit, 'end_date', '00:00'), 'HH:mm', 'en'),
138139
uri: this.entryToEdit.uri,
@@ -150,8 +151,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
150151
project_id: '',
151152
activity_id: '',
152153
description: '',
153-
start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
154-
end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
154+
start_date: formatDate(new Date(), DATE_FORMAT, 'en'),
155+
end_date: formatDate(new Date(), DATE_FORMAT, 'en'),
155156
start_hour: '00:00',
156157
end_hour: '00:00',
157158
uri: '',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/pipes/substract-date/substract-date.pipe.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { NumberFormatter } from './../../formatters/number.formatter';
22
import { Pipe, PipeTransform } from '@angular/core';
33
import * as moment from 'moment';
4+
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
45
@Pipe({
56
name: 'substractDate'
67
})
@@ -12,8 +13,8 @@ export class SubstractDatePipe implements PipeTransform {
1213
return '--:--';
1314
}
1415

15-
const startDate = moment(substractDate, 'YYYY-MM-DD HH:mm:ss');
16-
let endDate = moment(fromDate, 'YYYY-MM-DD HH:mm:ss');
16+
const startDate = moment(substractDate, `${DATE_FORMAT_YEAR} HH:mm:ss`);
17+
let endDate = moment(fromDate, `${DATE_FORMAT_YEAR} HH:mm:ss`);
1718
let duration: moment.Duration = moment.duration(endDate.diff(startDate));
1819

1920
if (duration.asSeconds() > 60 && !displaySeconds) {

src/app/modules/shared/time-range-form/time-range-form.component.html

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/app/modules/shared/time-range-form/time-range-form.component.ts

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)