Skip to content

Commit fe6a733

Browse files
committed
TT-52 feat: remove errors due to rebase
1 parent 2965e16 commit fe6a733

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe('EntryFieldsComponent', () => {
9696
description: 'description for active entry',
9797
uri: 'abc',
9898
start_date : moment().format(DATE_FORMAT_YEAR),
99-
start_hour : moment().format('HH:mm:ss'),
99+
start_hour : moment().format('HH:mm'),
100100
};
101101

102102
beforeEach(waitForAsync(() => {
@@ -143,7 +143,7 @@ describe('EntryFieldsComponent', () => {
143143
description: entryDataForm.description,
144144
uri: entryDataForm.uri,
145145
activity_id: entryDataForm.activity_id,
146-
start_hour: formatDate(entry.start_date, 'HH:mm:ss', 'en'),
146+
start_hour: formatDate(entry.start_date, 'HH:mm', 'en'),
147147
start_date : moment().format(DATE_FORMAT_YEAR),
148148
}
149149
);

src/app/modules/users/components/users-list/users-list.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { MockStore, provideMockStore } from '@ngrx/store/testing';
33

44
import { NgxPaginationModule } from 'ngx-pagination';

src/app/modules/users/pages/users.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22

33
import { UsersComponent } from './users.component';
44

0 commit comments

Comments
 (0)