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
44 changes: 43 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"@angular/platform-browser": "~10.2.2",
"@angular/platform-browser-dynamic": "~10.2.2",
"@angular/router": "~10.2.2",
"@azure/app-configuration": "^1.1.0",
"@azure/identity": "^1.1.0",
"@ngrx/effects": "^10.0.1",
"@ngrx/store": "^10.0.1",
"@ngrx/store-devtools": "^10.0.1",
"@types/datatables.net-buttons": "^1.4.3",
"angular-datatables": "^9.0.2",
"@azure/app-configuration": "^1.1.0",
"@azure/identity": "^1.1.0",
"bootstrap": "^4.4.1",
"datatables.net": "^1.10.21",
"datatables.net-buttons": "^1.6.2",
Expand All @@ -40,6 +40,7 @@
"msal": "^1.2.1",
"ngx-cookie-service": "^11.0.2",
"ngx-mask": "^9.1.2",
"ngx-material-timepicker": "^5.5.3",
"ngx-pagination": "^5.0.0",
"ngx-toastr": "^12.0.1",
"rxjs": "~6.6.3",
Expand Down Expand Up @@ -95,8 +96,8 @@
},
"config": {
"commit-message-validator": {
"pattern": "^(fix: #|feat: #|perf: #|build: #|ci: #|docs: #|refactor: #|style: #|test: #)[0-9].*",
"errorMessage": "Your commit message needs to start with fix:, feat:, or perf: followed by issue number, e.g. fix: #43 any commit message"
"pattern": "^(TT-)[0-9].*(fix: |feat: |perf: |build: |ci: |docs: |refactor: |style: |test: )",
"errorMessage": "Your commit message needs to start with TT-number fix:, feat:, or perf: followed by any commit message, e.g. TT-43 fix: any commit message"
}
},
"resolutions": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';

describe('AppComponent', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule
Expand Down
2 changes: 2 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { DialogComponent } from './modules/shared/components/dialog/dialog.compo
import { LoadingBarComponent } from './modules/shared/components/loading-bar/loading-bar.component';
import { UsersComponent } from './modules/users/pages/users.component';
import { UsersListComponent } from './modules/users/components/users-list/users-list.component';
import {NgxMaterialTimepickerModule} from 'ngx-material-timepicker';

const maskConfig: Partial<IConfig> = {
validation: false,
Expand Down Expand Up @@ -135,6 +136,7 @@ const maskConfig: Partial<IConfig> = {
NgxPaginationModule,
DataTablesModule,
AutocompleteLibModule,
NgxMaterialTimepickerModule,
StoreModule.forRoot(reducers, {
metaReducers,
}),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { allActivities } from './../../store/activity-management.selectors';
import { ActivityState } from './../../store/activity-management.reducers';
Expand All @@ -19,7 +19,7 @@ describe('ActivityListComponent', () => {
activityIdToEdit: '',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ActivityListComponent],
providers: [provideMockStore({ initialState: state })],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FormBuilder } from '@angular/forms';
import { async, TestBed, ComponentFixture } from '@angular/core/testing';
import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing';
import { provideMockStore, MockStore } from '@ngrx/store/testing';

import { CreateActivityComponent } from './create-activity.component';
Expand Down Expand Up @@ -36,7 +36,7 @@ describe('CreateActivityComponent', () => {
description: 'It is good for learning',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CreateActivityComponent],
providers: [FormBuilder, provideMockStore({ initialState: state })],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { async, TestBed, ComponentFixture } from '@angular/core/testing';
import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing';
import { ActivitiesManagementComponent } from './activities-management.component';

describe('ActivitiesManagementComponent', () => {
let component: ActivitiesManagementComponent;
let fixture: ComponentFixture<ActivitiesManagementComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [],
declarations: [ActivitiesManagementComponent]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LoadCustomerProjects, CleanCustomerProjects } from './../../../projects/components/store/project.actions';
import { LoadProjectTypes, CleanProjectTypes } from './../../../projects-type/store/project-type.actions';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder } from '@angular/forms';
import { MockStore, provideMockStore } from '@ngrx/store/testing';

Expand All @@ -27,7 +27,7 @@ describe('CreateCustomerComponent', () => {
description: 'bb',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CreateCustomerComponent],
providers: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MockStore, provideMockStore } from '@ngrx/store/testing';

import { NgxPaginationModule } from 'ngx-pagination';
Expand Down Expand Up @@ -29,7 +29,7 @@ describe('CustomerTableListComponent', () => {
customerId: '',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [NgxPaginationModule, DataTablesModule],
declarations: [CustomerListComponent],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { ManagementCustomerProjectsComponent } from './management-customer-projects.component';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
Expand All @@ -17,7 +17,7 @@ describe('ManagmentCustomerProjectsComponent', () => {
customerId: '',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ManagementCustomerProjectsComponent],
providers: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormBuilder } from '@angular/forms';
import { provideMockStore, MockStore } from '@ngrx/store/testing';

Expand Down Expand Up @@ -38,7 +38,7 @@ describe('InputProjectTypeComponent', () => {
description: 'It is good for learning',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CreateProjectTypeComponent],
providers: [FormBuilder, provideMockStore({ initialState: state })],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { NgxPaginationModule } from 'ngx-pagination';

Expand All @@ -19,7 +19,7 @@ describe('ProjectTypeTableListComponent', () => {
projectTypeIdToEdit: '',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [NgxPaginationModule],
declarations: [ProjectTypeListComponent],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { FormBuilder } from '@angular/forms';
import { Subscription } from 'rxjs';
Expand Down Expand Up @@ -35,7 +35,7 @@ describe('InputProjectComponent', () => {
project_type_id: '123',
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CreateProjectComponent],
providers: [FormBuilder, provideMockStore({ initialState: state })],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SetCustomerToEdit } from 'src/app/modules/customer-management/store';
import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { Customer } from 'src/app/modules/shared/models';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { CustomerComponent } from './customer.component';

Expand All @@ -10,7 +10,7 @@ describe('CustomerComponent', () => {
let fixture: ComponentFixture<CustomerComponent>;
let store: MockStore<Customer>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CustomerComponent],
providers: [provideMockStore({ initialState: {} })],
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/home/home.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { HomeComponent } from './home.component';

describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/login/login.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed, inject } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AzureAdB2CService } from '../../modules/login/services/azure.ad.b2c.service';
import { of } from 'rxjs';
Expand All @@ -22,7 +22,7 @@ describe('LoginComponent', () => {
}
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ RouterTestingModule ],
declarations: [ LoginComponent ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { Entry } from 'src/app/modules/shared/models';
import { SubstractDatePipe } from 'src/app/modules/shared/pipes/substract-date/substract-date.pipe';
Expand Down Expand Up @@ -41,7 +41,7 @@ describe('Reports Page', () => {
}
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [],
declarations: [TimeEntriesTableComponent, SubstractDatePipe],
Expand All @@ -51,7 +51,7 @@ describe('Reports Page', () => {

}));

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
fixture = TestBed.createComponent(TimeEntriesTableComponent);
component = fixture.componentInstance;
store.setState(state);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ToastrService, IndividualConfig } from 'ngx-toastr';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { TimeRangeFormComponent } from './time-range-form.component';
import { EntryState } from '../../../time-clock/store/entry.reducer';
Expand Down Expand Up @@ -39,7 +39,7 @@ describe('Reports Page', () => {
entriesForReport: [timeEntry],
};

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [FormsModule, ReactiveFormsModule],
declarations: [TimeRangeFormComponent, InputDateComponent],
Expand Down
6 changes: 3 additions & 3 deletions src/app/modules/reports/pages/reports.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { ReportsComponent } from './reports.component';

describe('ReportsComponent', () => {
let component: ReportsComponent;
let fixture: ComponentFixture<ReportsComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ReportsComponent],
}).compileComponents();
Expand All @@ -23,7 +23,7 @@ describe('ReportsComponent', () => {
expect(component).toBeTruthy();
});

it('should have form and datatable components', async(() => {
it('should have form and datatable components', waitForAsync(() => {
fixture.detectChanges();

const compile = fixture.debugElement.nativeElement;
Expand Down
Loading