Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
[class.is-invalid]="start_date.invalid && start_date.touched"
required
(ngModelChange)="onStartDateChange($event)"
[max]="getActualDate()"
onkeydown="return false"
/>
</div>

Expand Down Expand Up @@ -118,6 +120,8 @@
aria-describedby="inputGroup-sizing-sm"
[class.is-invalid]="end_date.invalid && end_date.touched"
required
[max]="getActualDate()"
onkeydown="return false"
/>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,12 @@ describe('DetailsFieldsComponent', () => {
expect(endDateInput.value).not.toEqual(startDateInput.value);
expect(startDateInput.value).toEqual(expectedStartDate);
});

it('on get actual date should return the current date', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update the references and the name of the test. Something like:
On get current date should return expected date

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actualDateExpected to expectedDate

const actualDateExpected = new Date().toISOString().split('T')[0];

expect(component.getActualDate()).toEqual(actualDateExpected);
});
/*
TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component,
and now these couple of tests are failing. A solution to this error might be generate a Test Wrapper Component. More details here:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
this.selectedTechnologies = $event;
}

getActualDate(): string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should change this to getCurrentDate. And update all references from actual date to current date

return new Date().toISOString().split('T')[0];
}

get project_id() {
return this.entryForm.get('project_id');
}
Expand Down