From 788b49ca3e5e42e7b34c19130b269eb8a2ba746d Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 4 May 2021 15:50:31 +0200 Subject: [PATCH 1/2] Changed node-engine to 15 --- .nvmrc | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.nvmrc b/.nvmrc index 33db3f0..fc2cbe5 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -15.11.0 +15.14.0 diff --git a/package.json b/package.json index e84ac75..a2efd07 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "repository": "https://bitbucket.arbetsformedlingen.se/projects/TEA/repos/dafa-web-monorepo", "engines": { - "node": "14.16.1" + "node": "15" }, "scripts": { "ng": "nx", From 4525953a78f8b0499eafd8ed2b75bcb70b9ff02e Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 5 May 2021 07:53:33 +0200 Subject: [PATCH 2/2] Fixed some tests --- .../create-account.component.spec.ts | 20 ++++++++++++++++++- .../employee-card.component.spec.ts | 3 ++- .../employees/employees.component.spec.ts | 3 ++- .../participants.component.spec.ts | 4 ++-- tools/generators/.gitkeep | 0 5 files changed, 25 insertions(+), 5 deletions(-) delete mode 100644 tools/generators/.gitkeep diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.spec.ts b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.spec.ts index 9c1c597..5a164af 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.spec.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.spec.ts @@ -1,4 +1,12 @@ +import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox'; +import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker'; +import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input'; +import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group'; +import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; +import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { CreateAccountComponent } from './create-account.component'; @@ -10,7 +18,17 @@ describe('CreateAccountComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [CreateAccountComponent], - imports: [RouterTestingModule], + imports: [ + RouterTestingModule, + HttpClientTestingModule, + ReactiveFormsModule, + DigiNgFormInputModule, + DigiNgFormRadiobuttonGroupModule, + DigiNgFormDatepickerModule, + DigiNgFormSelectModule, + DigiNgPopoverModule, + DigiNgFormCheckboxModule, + ], }).compileComponents(); }) ); diff --git a/apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.spec.ts b/apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.spec.ts index 5597a54..4899718 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.spec.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.spec.ts @@ -1,3 +1,4 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { EmployeeCardComponent } from './employee-card.component'; @@ -10,7 +11,7 @@ describe('EmployeeCardComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [EmployeeCardComponent], - imports: [RouterTestingModule], + imports: [RouterTestingModule, HttpClientTestingModule], }).compileComponents(); }) ); diff --git a/apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.spec.ts b/apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.spec.ts index 7bdbd19..64aad68 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.spec.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.spec.ts @@ -1,3 +1,4 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { EmployeesComponent } from './employees.component'; @@ -10,7 +11,7 @@ describe('EmployeesComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [EmployeesComponent], - imports: [RouterTestingModule], + imports: [RouterTestingModule, HttpClientTestingModule], }).compileComponents(); }) ); diff --git a/apps/dafa-web/src/app/pages/participants/participants.component.spec.ts b/apps/dafa-web/src/app/pages/participants/participants.component.spec.ts index 4b3016f..fa23f03 100644 --- a/apps/dafa-web/src/app/pages/participants/participants.component.spec.ts +++ b/apps/dafa-web/src/app/pages/participants/participants.component.spec.ts @@ -1,5 +1,5 @@ import { DigiNgSkeletonBaseModule } from '@af/digi-ng/_skeleton/skeleton-base'; -import { HttpClientModule } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { ParticipantsListModule } from './components/participants-list/participants-list.module'; @@ -13,7 +13,7 @@ describe('ParticipantsComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ParticipantsComponent], - imports: [RouterTestingModule, HttpClientModule, DigiNgSkeletonBaseModule, ParticipantsListModule], + imports: [RouterTestingModule, HttpClientTestingModule, DigiNgSkeletonBaseModule, ParticipantsListModule], }).compileComponents(); }) ); diff --git a/tools/generators/.gitkeep b/tools/generators/.gitkeep deleted file mode 100644 index e69de29..0000000