diff --git a/package-lock.json b/package-lock.json index 59358402b..ac683c952 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3696,7 +3696,8 @@ "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true }, "camelcase-keys": { "version": "6.2.2", @@ -4946,7 +4947,8 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decamelize-keys": { "version": "1.1.0", @@ -10405,7 +10407,8 @@ }, "decamelize": { "version": "1.2.0", - "bundled": true + "bundled": true, + "dev": true }, "decode-uri-component": { "version": "0.2.0", @@ -13220,26 +13223,22 @@ "set-blocking": "^2.0.0", "string-width": "^2.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1" + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" }, "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, "y18n": { "version": "3.2.1", "bundled": true, "dev": true }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "^4.1.0" } } } @@ -19442,7 +19441,8 @@ "set-blocking": "^2.0.0", "string-width": "^2.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0" + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" }, "dependencies": { "find-up": { @@ -19487,18 +19487,19 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index ea5f5ddea..7c27d169a 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -4,13 +4,13 @@ Project
@@ -18,13 +18,13 @@ Activity
@@ -109,7 +109,7 @@
- + diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index d594db0c4..77e36a0a3 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -48,8 +48,8 @@ describe('DetailsFieldsComponent', () => { }; const initialData = { - project: '', - activity: '', + project_id: '', + activity_id: '', uri: '', start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), @@ -75,7 +75,6 @@ describe('DetailsFieldsComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(DetailsFieldsComponent); component = fixture.componentInstance; - fixture.detectChanges(); }); it('should create', () => { @@ -100,8 +99,8 @@ describe('DetailsFieldsComponent', () => { description: '', }; const formValue = { - project: 'name', - activity: 'abc', + project_id: 'id', + activity_id: 'fc5fab41-a21e-4155-9d05-511b956ebd05', uri: 'ticketUri', start_date: '2020-02-05', end_date: '2020-02-05', @@ -117,7 +116,7 @@ describe('DetailsFieldsComponent', () => { it('should emit ngOnChange with new data', () => { const entryToEdit = { - project_id: 'abc', + project_id: '', activity_id: '', uri: 'ticketUri', start_date: null, @@ -125,8 +124,8 @@ describe('DetailsFieldsComponent', () => { description: '', }; const formValue = { - project: '', - activity: '', + project_id: '', + activity_id: '', uri: 'ticketUri', start_date: '', end_date: '', @@ -142,8 +141,8 @@ describe('DetailsFieldsComponent', () => { it('should emit ngOnChange with new data', () => { const formValue = { - project: '', - activity: '', + project_id: '', + activity_id: '', uri: '', start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), end_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), @@ -157,27 +156,8 @@ describe('DetailsFieldsComponent', () => { expect(component.entryForm.value).toEqual(formValue); }); - it('should dispatch FindTechnology action #getTechnologies', () => { - const value = 'java'; - spyOn(store, 'dispatch'); - length = value.length; - component.getTechnologies(value); - - expect(component.showlist).toBe(true); - expect(store.dispatch).toHaveBeenCalledWith(new actions.FindTechnology(value)); - }); - - it('should NOT dispatch FindTechnology action #getTechnologies', () => { - const value = 'j'; - spyOn(store, 'dispatch'); - length = value.length; - component.getTechnologies(value); - - expect(store.dispatch).not.toHaveBeenCalledWith(new actions.FindTechnology(value)); - }); - it('should call createError ', () => { - mockEntriesUpdateErrorSelector = store.overrideSelector(getCreateError, false); + mockEntriesCreateErrorSelector = store.overrideSelector(getCreateError, false); spyOn(store, 'dispatch'); component.ngOnInit(); expect(store.dispatch).toHaveBeenCalledWith(new entryActions.CleanEntryCreateError(null)); @@ -194,8 +174,8 @@ describe('DetailsFieldsComponent', () => { spyOn(component.saveEntry, 'emit'); component.onSubmit(); const data = { - project_id: null, - activity_id: null, + project_id: '', + activity_id: '', technologies: [], description: '', start_date: 'T00:00', @@ -208,8 +188,8 @@ describe('DetailsFieldsComponent', () => { it('should emit saveEntry without project and activite fields event', () => { spyOn(component.saveEntry, 'emit'); component.entryForm.setValue({ - project: 'name', - activity: 'activity1', + project_id: 'id', + activity_id: 'fc5fab41-a21e-4155-9d05-511b956ebd05', uri: '', start_date: '', end_date: '', @@ -222,6 +202,7 @@ describe('DetailsFieldsComponent', () => { { id: 'fc5fab41-a21e-4155-9d05-511b956ebd05', tenant_id: 'ioet', name: 'activity1', description: '' }, ]; component.onSubmit(); + fixture.detectChanges(); const data = { project_id: 'id', activity_id: 'fc5fab41-a21e-4155-9d05-511b956ebd05', diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index ce5fbd1c7..8c2780127 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -11,12 +11,9 @@ import { } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Store, select } from '@ngrx/store'; -import * as actions from '../../store/technology.actions'; import { formatDate } from '@angular/common'; -import { allTechnologies } from '../../store/technology.selectors'; -import { Technology, Project, Activity } from '../../models'; - +import { Project, Activity } from '../../models'; import { ProjectState } from '../../../customer-management/components/projects/components/store/project.reducer'; import { TechnologyState } from '../../store/technology.reducers'; import { LoadActivities, ActivityState, allActivities } from '../../../activities-management/store'; @@ -40,7 +37,6 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { @ViewChild('closeModal') closeModal: ElementRef; @ViewChild('list') list: ElementRef; entryForm: FormGroup; - technology: Technology; selectedTechnologies: string[] = []; isLoading = false; listProjects: Project[] = []; @@ -56,8 +52,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } }); this.entryForm = this.formBuilder.group({ - project: '', - activity: '', + project_id: '', + activity_id: '', description: '', start_date: '', end_date: '', @@ -69,11 +65,6 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } ngOnInit(): void { - const technologies$ = this.store.pipe(select(allTechnologies)); - technologies$.subscribe((response) => { - this.isLoading = response.isLoading; - this.technology = response.technologyList; - }); this.store.dispatch(new projectActions.LoadProjects()); const projects$ = this.store.pipe(select(getProjects)); @@ -90,15 +81,15 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { const updateError$ = this.store.pipe(select(getUpdateError)); updateError$.subscribe((updateError) => { if (updateError != null && !updateError) { - this.closeEntryModal(); this.store.dispatch(new entryActions.CleanEntryUpdateError(null)); + this.closeEntryModal(); } }); const createError$ = this.store.pipe(select(getCreateError)); createError$.subscribe((createError) => { if (createError != null && !createError) { - this.closeEntryModal(); this.store.dispatch(new entryActions.CleanEntryCreateError(null)); + this.closeEntryModal(); } }); } @@ -107,11 +98,9 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { this.hoursValidation = false; if (this.entryToEdit) { this.selectedTechnologies = this.entryToEdit.technologies; - const project = this.listProjects.find((p) => p.id === this.entryToEdit.project_id); - const activity = this.activities.find((a) => a.id === this.entryToEdit.activity_id); this.entryForm.setValue({ - project: project ? project.name : '', - activity: activity ? activity.name : '', + project_id: this.entryToEdit.project_id, + activity_id: this.entryToEdit.activity_id, description: this.entryToEdit.description, start_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'yyyy-MM-dd', 'en') : '', start_hour: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'HH:mm', 'en') : '00:00', @@ -123,8 +112,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } else { this.selectedTechnologies = []; this.entryForm.setValue({ - project: '', - activity: '', + project_id: '', + activity_id: '', description: '', start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), start_hour: '00:00', @@ -136,22 +125,15 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } } - getTechnologies(value) { - if (value.length >= 2) { - this.showlist = true; - this.store.dispatch(new actions.FindTechnology(value)); - } - } - onTechnologiesUpdated($event: string[]) { this.selectedTechnologies = $event; } - get project() { - return this.entryForm.get('project'); + get project_id() { + return this.entryForm.get('project_id'); } - get activity() { - return this.entryForm.get('activity'); + get activity_id() { + return this.entryForm.get('activity_id'); } get start_date() { @@ -176,12 +158,10 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } onSubmit() { - const activity = this.activities.find((a) => a.name === this.entryForm.value.activity); - const project = this.listProjects.find((p) => p.name === this.entryForm.value.project); const entry = { - project_id: project ? project.id : null, - activity_id: activity ? activity.id : null, - technologies: this.selectedTechnologies, + project_id: this.entryForm.value.project_id, + activity_id: this.entryForm.value.activity_id, + technologies: this.selectedTechnologies ? this.selectedTechnologies : [], description: this.entryForm.value.description, start_date: `${this.entryForm.value.start_date}T${this.entryForm.value.start_hour}`, end_date: `${this.entryForm.value.end_date}T${this.entryForm.value.end_hour}`, diff --git a/src/app/modules/shared/components/technologies/technologies.component.html b/src/app/modules/shared/components/technologies/technologies.component.html index 8db025a33..36a4e9e56 100644 --- a/src/app/modules/shared/components/technologies/technologies.component.html +++ b/src/app/modules/shared/components/technologies/technologies.component.html @@ -22,13 +22,13 @@ {{ item.name }}
-
+
{{ technology }}
-
+
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts index 1f8c958c0..66b862120 100644 --- a/src/app/modules/shared/models/entry.model.ts +++ b/src/app/modules/shared/models/entry.model.ts @@ -2,7 +2,7 @@ export interface Entry { id: string; start_date: Date; end_date: Date; - activity: string; + activity_id?: string; technologies: string[]; comments?: string; uri?: string; @@ -15,4 +15,5 @@ export interface NewEntry { description?: string; technologies?: string[]; uri?: string; + activity_id?: string; } diff --git a/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts b/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts index f734cc67c..b0d145527 100644 --- a/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts +++ b/src/app/modules/shared/pipes/group-by-date/group-by-date.pipe.spec.ts @@ -20,7 +20,7 @@ describe('GroupByDatePipe', () => { project: 'Mido - 05 de Febrero', startDate: '2020-02-05T15:36:15.887Z', endDate: '2020-02-05T18:36:15.887Z', - activity: 'development', + activity_id: 'development', technology: 'Angular, TypeScript', comments: 'No comments', ticket: 'EY-25', @@ -30,7 +30,7 @@ describe('GroupByDatePipe', () => { project: 'Mido 15 de Marzo', startDate: '2020-03-15T20:36:15.887Z', endDate: '2020-03-15T23:36:15.887Z', - activity: 'development', + activity_id: 'development', technology: 'Angular, TypeScript', comments: 'No comments', ticket: 'EY-38', @@ -40,7 +40,7 @@ describe('GroupByDatePipe', () => { project: 'GoSpace 15 y 16 de Marzo', startDate: '2020-03-15T23:36:15.887Z', endDate: '2020-03-16T05:36:15.887Z', - activity: 'development', + activity_id: 'development', technology: 'Angular, TypeScript', comments: 'No comments', ticket: 'EY-225', @@ -50,7 +50,7 @@ describe('GroupByDatePipe', () => { project: 'Mido 16 de Marzo', startDate: '2020-03-16T15:36:15.887Z', endDate: '2020-03-16T18:36:15.887Z', - activity: 'development', + activity_id: 'development', technology: 'Angular, TypeScript', comments: 'No comments', ticket: 'EY-89', @@ -60,7 +60,7 @@ describe('GroupByDatePipe', () => { project: 'Ernst&Young 01 de Abril', startDate: '2020-04-01T09:36:15.887Z', endDate: '2020-04-01T15:36:15.887Z', - activity: 'development', + activity_id: 'development', technology: 'Angular, TypeScript', comments: 'No comments', ticket: 'EY-59', diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html index e843ccb66..a98b39fa7 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html @@ -3,8 +3,8 @@
Activity
- +
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts index 13a6d4ba6..1334c0f77 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts @@ -30,13 +30,14 @@ describe('EntryFieldsComponent', () => { isLoading: false, }, activities: { - data: [{id: 'fc5fab41-a21e-4155-9d05-511b956ebd05', tenant_id: 'ioet', deleted: null, name: 'Training 2'}], + data: [{id: 'xyz', tenant_id: 'ioet', deleted: null, name: 'Training 2'}], isLoading: false, message: 'Data fetch successfully!', activityIdToEdit: '', }, entries: { active: { + activity_id: 'xyz', id: 'id-15', project_id: 'project-id-15', description: 'description for active entry', @@ -49,6 +50,7 @@ describe('EntryFieldsComponent', () => { }; const entry = { + activity_id: 'xyz', id: 'id-15', project_id: 'project-id-15', description: 'description for active entry', @@ -78,6 +80,7 @@ describe('EntryFieldsComponent', () => { it('should set data in entryForm', () => { const entryDataForm = { + activity_id: 'xyz', description: 'description for active entry', technologies: null, uri: 'abc', @@ -89,7 +92,7 @@ describe('EntryFieldsComponent', () => { expect(component.entryForm.patchValue).toHaveBeenCalledTimes(1); expect(component.entryForm.patchValue).toHaveBeenCalledWith( - {description: entryDataForm.description, uri: entryDataForm.uri}); + { description: entryDataForm.description, uri: entryDataForm.uri, activity_id: entryDataForm.activity_id }); expect(component.selectedTechnologies).toEqual([]); }); diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts index 25125d997..a5d1682ce 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts @@ -28,7 +28,8 @@ export class EntryFieldsComponent implements OnInit { constructor(private formBuilder: FormBuilder, private store: Store) { this.entryForm = this.formBuilder.group({ description: '', - uri: '' + uri: '', + activity_id: '' }); } @@ -48,6 +49,7 @@ export class EntryFieldsComponent implements OnInit { id: this.activeEntry.id, project_id: this.activeEntry.project_id, uri: this.activeEntry.uri, + activity_id: this.activeEntry.activity_id, }; } }); @@ -58,6 +60,7 @@ export class EntryFieldsComponent implements OnInit { this.entryForm.patchValue({ description: entryData.description, uri: entryData.uri, + activity_id: entryData.activity_id, }); if (entryData.technologies) { this.selectedTechnologies = entryData.technologies; diff --git a/src/app/modules/time-clock/store/entry.actions.spec.ts b/src/app/modules/time-clock/store/entry.actions.spec.ts index 64535d610..21417bec9 100644 --- a/src/app/modules/time-clock/store/entry.actions.spec.ts +++ b/src/app/modules/time-clock/store/entry.actions.spec.ts @@ -60,7 +60,7 @@ describe('Actions for Entries', () => { id: '1', start_date: new Date(), end_date: new Date(), - activity: '', + activity_id: '', technologies: ['abc', 'abc'], }); expect(updateActiveEntrySuccess.type).toEqual(actions.EntryActionTypes.UPDATE_ACTIVE_ENTRY_SUCCESS); diff --git a/src/app/modules/time-clock/store/entry.effects.ts b/src/app/modules/time-clock/store/entry.effects.ts index 0cd82e565..01d174b54 100644 --- a/src/app/modules/time-clock/store/entry.effects.ts +++ b/src/app/modules/time-clock/store/entry.effects.ts @@ -56,7 +56,9 @@ export class EntryEffects { mergeMap((entry) => this.entryService.createEntry(entry).pipe( map((entryData) => { - if (entryData.end_date !== null) { + if (entryData.end_date === null) { + this.toastrService.success('You clocked-in successfully'); + } else { this.toastrService.success(INFO_SAVED_SUCCESSFULLY); } return new actions.CreateEntrySuccess(entryData); @@ -94,7 +96,6 @@ export class EntryEffects { mergeMap((project) => this.entryService.updateActiveEntry(project).pipe( map((projectData) => { - this.toastrService.success(INFO_DELETE_SUCCESSFULLY); return new actions.UpdateActiveEntrySuccess(projectData); }), catchError((error) => { diff --git a/src/app/modules/time-clock/store/entry.reducer.spec.ts b/src/app/modules/time-clock/store/entry.reducer.spec.ts index 7fb991895..301238c4d 100644 --- a/src/app/modules/time-clock/store/entry.reducer.spec.ts +++ b/src/app/modules/time-clock/store/entry.reducer.spec.ts @@ -64,7 +64,7 @@ describe('entryReducer', () => { it('on LoadActiveEntrySuccess, activeEntryFound are saved in the store', () => { const activeEntryFound: NewEntry[] = [ - { project_id: '123', description: 'description', technologies: ['angular', 'javascript'] }, + { project_id: '123', description: 'description', technologies: ['angular', 'javascript'] , activity_id: 'xyz'}, ]; const action = new actions.LoadActiveEntrySuccess(activeEntryFound); const state = entryReducer(initialState, action); @@ -94,7 +94,7 @@ describe('entryReducer', () => { id: 'id', start_date: new Date(), end_date: new Date(), - activity: 'activity', + activity_id: 'activity', }, ]; const action = new actions.LoadEntriesSuccess(entries); @@ -151,7 +151,7 @@ describe('entryReducer', () => { id: 'id', start_date: new Date(), end_date: new Date(), - activity: 'activity', + activity_id: 'activity', }, ], isLoading: false, @@ -189,7 +189,7 @@ describe('entryReducer', () => { id: 'id', start_date: new Date(), end_date: new Date(), - activity: 'activity', + activity_id: 'activity', }, ], isLoading: false, @@ -202,7 +202,7 @@ describe('entryReducer', () => { id: 'id', start_date: new Date(), end_date: new Date(), - activity: '', + activity_id: '', technologies: ['abc', 'abc'], }; const action = new actions.UpdateActiveEntrySuccess(entryUpdated); diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts index f083baca0..96cf546f2 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.spec.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.spec.ts @@ -54,7 +54,7 @@ describe('TimeEntriesComponent', () => { project_id: 'abc', start_date: new Date('2020-02-05T15:36:15.887Z'), end_date: new Date('2020-02-05T18:36:15.887Z'), - activity: 'development', + activity_id: 'development', technologies: ['Angular', 'TypeScript'], comments: 'No comments', uri: 'EY-25', @@ -99,18 +99,20 @@ describe('TimeEntriesComponent', () => { })); it('should call dataByMonth with data in ngOnInit()', async(() => { - const newEntry = { - id: 'entry_1', + const entryCurrentMonth = { + id: '1', project_id: 'Mido - 05 de Febrero', start_date: new Date(), end_date: new Date(), - activity: 'development', + activity_id: 'development', technologies: ['Angular', 'TypeScript'], comments: 'No comments', uri: 'EY-25', }; - mockEntriesSelector = store.overrideSelector(allEntries, [newEntry]); + mockEntriesSelector = store.overrideSelector(allEntries, [entryCurrentMonth]); + component.ngOnInit(); + expect(component.dataByMonth.length).toEqual(1); })); @@ -120,7 +122,7 @@ describe('TimeEntriesComponent', () => { project_id: 'Mido - 05 de Febrero', start_date: new Date(), end_date: null, - activity: 'development', + activity_id: 'development', technologies: ['Angular', 'TypeScript'], comments: 'No comments', uri: 'EY-25', @@ -136,7 +138,7 @@ describe('TimeEntriesComponent', () => { project_id: 'Mido - 05 de Febrero', start_date: new Date('2020-02-05T15:36:15.887Z'), end_date: new Date('2020-02-05T18:36:15.887Z'), - activity: 'development', + activity_id: 'development', technologies: ['Angular', 'TypeScript'], comments: 'No comments', uri: 'EY-25',