Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
test: #402 Fixing flaky test
  • Loading branch information
Juan Gabriel Guzman committed Sep 18, 2020
commit 2e60be71d54cdf71e1c60ba62cdf712f8420fd32
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { AutocompleteLibModule } from 'angular-ng-autocomplete';
import { formatDate } from '@angular/common';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ActionsSubject } from '@ngrx/store';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { AutocompleteLibModule } from 'angular-ng-autocomplete';
import * as moment from 'moment';
import { IndividualConfig, ToastrService } from 'ngx-toastr';
import { getCreateError, getUpdateError } from 'src/app/modules/time-clock/store/entry.selectors';
import { ProjectState } from '../../../customer-management/components/projects/components/store/project.reducer';
Expand All @@ -17,6 +18,7 @@ import { TechnologiesComponent } from './../technologies/technologies.component'
import { DetailsFieldsComponent } from './details-fields.component';
import { SaveEntryEvent } from './save-entry-event';


describe('DetailsFieldsComponent', () => {
type Merged = TechnologyState & ProjectState & EntryState;
let component: DetailsFieldsComponent;
Expand Down Expand Up @@ -304,16 +306,15 @@ describe('DetailsFieldsComponent', () => {
expect(component.saveEntry.emit).toHaveBeenCalledWith(data);
});

// TODO Fix this test since it is failing.
// it('displays error message when the date selected is in the future', () => {
// spyOn(toastrServiceStub, 'error');
it('displays error message when the date selected is in the future', () => {
spyOn(toastrServiceStub, 'error');

// const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
// component.entryForm.setValue({ ...formValues, entry_date: futureDate });
// component.onSubmit();
const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
component.entryForm.setValue({ ...formValues, entry_date: futureDate });
component.onSubmit();

// expect(toastrServiceStub.error).toHaveBeenCalled();
// });
expect(toastrServiceStub.error).toHaveBeenCalled();
});

/*
TODO As part of https://github.com/ioet/time-tracker-ui/issues/424 a new parameter was added to the details-field-component,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { formatDate } from '@angular/common';
import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActionsSubject, select, Store } from '@ngrx/store';
import * as moment from 'moment';
import { ToastrService } from 'ngx-toastr';
import { filter } from 'rxjs/operators';
import { getCreateError, getUpdateError } from 'src/app/modules/time-clock/store/entry.selectors';
Expand All @@ -16,6 +17,7 @@ import { TechnologyState } from '../../store/technology.reducers';
import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
import { SaveEntryEvent } from './save-entry-event';


type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@Component({
selector: 'app-details-fields',
Expand Down Expand Up @@ -203,8 +205,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
if (this.goingToWorkOnThis) {
delete entry.end_date;
}

const isEntryDateInTheFuture = new Date(entryDate) > new Date();
const isEntryDateInTheFuture = moment(entryDate).isAfter(moment());
if (isEntryDateInTheFuture) {
this.toastrService.error('You cannot start a time-entry in the future');
return;
Expand Down