Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: TT-117 two entries in progress bug
  • Loading branch information
scastillo-jp committed Jan 29, 2021
commit 95f312127c5ac01c54798ac5260ecfe57632087a
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,22 @@ describe('DetailsFieldsComponent', () => {
expect(component).toBeTruthy();
});

it('onClearedComponent project id and name it is set to empty', () => {
it('onClearedComponent project id and name are set to empty', () => {
component.onClearedComponent(null);

expect(component.project_id.value).toBe('');
expect(component.project_name.value).toBe('');
});

it('onSelectedProject project id and name it is set using event data', () => {
it('onSelectedProject project id and name are set using event data', () => {
spyOn(component.entryForm, 'patchValue');

component.onSelectedProject( {id: 'id', search_field: 'foo'} );

expect(component.entryForm.patchValue).toHaveBeenCalledWith( { project_id: 'id', project_name: 'foo', } );
});

it('if form is invalid then no save is emited', () => {
it('if form is invalid then saveEntry is not emited', () => {
spyOn(component.saveEntry, 'emit');

component.onSubmit();
Expand Down Expand Up @@ -172,6 +172,7 @@ describe('DetailsFieldsComponent', () => {
it('should emit ngOnChange without data', () => {
component.entryToEdit = null;
component.ngOnChanges();
expect(component.shouldRestartEntry).toBeFalse();
expect(component.entryForm.value).toEqual(initialData);
});

Expand Down Expand Up @@ -243,6 +244,7 @@ describe('DetailsFieldsComponent', () => {
},
shouldRestartEntry: false
};
expect(component.shouldRestartEntry).toBeFalse();
expect(component.saveEntry.emit).toHaveBeenCalledWith(data);
});

Expand Down Expand Up @@ -300,14 +302,6 @@ describe('DetailsFieldsComponent', () => {
expect(component.goingToWorkOnThis).toBeFalse();
});

it('when editing entry that already finished, then the entry should not be marked as running', () => {
component.entryToEdit = { ...entryToEdit, running: false };

fixture.componentInstance.ngOnChanges();

expect(component.goingToWorkOnThis).toBeFalse();
});

it('when submitting a entry that is currently running, the end date should not be sent ', () => {
component.goingToWorkOnThis = true;
spyOn(component.saveEntry, 'emit');
Expand All @@ -328,6 +322,7 @@ describe('DetailsFieldsComponent', () => {
},
shouldRestartEntry: false
};
expect(component.shouldRestartEntry).toBeFalse();
expect(component.saveEntry.emit).toHaveBeenCalledWith(data);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {

ngOnChanges(): void {
this.goingToWorkOnThis = this.entryToEdit ? this.entryToEdit.running : false;
this.shouldRestartEntry = false;
if (this.entryToEdit) {
this.selectedTechnologies = this.entryToEdit.technologies;
const projectFound = this.listProjects.find((project) => project.id === this.entryToEdit.project_id);
Expand Down