fix failing tests
This commit is contained in:
@@ -12,6 +12,7 @@
|
|||||||
></msfa-error-list>
|
></msfa-error-list>
|
||||||
<ui-input
|
<ui-input
|
||||||
[uiId]="emailElementId"
|
[uiId]="emailElementId"
|
||||||
|
uiName="email"
|
||||||
uiLabel="E-post adress"
|
uiLabel="E-post adress"
|
||||||
uiType="email"
|
uiType="email"
|
||||||
[formControl]="emailFormControl"
|
[formControl]="emailFormControl"
|
||||||
@@ -30,6 +31,7 @@
|
|||||||
<!-- Vi får se till att bygga en kontrol för att kunna välja flera tjänster här istället, en ui-selectfår vara en temporär lösning.. -->
|
<!-- Vi får se till att bygga en kontrol för att kunna välja flera tjänster här istället, en ui-selectfår vara en temporär lösning.. -->
|
||||||
<ui-select
|
<ui-select
|
||||||
[formControl]="tjansterFormControl"
|
[formControl]="tjansterFormControl"
|
||||||
|
uiName="tjanster"
|
||||||
[uiId]="tjansterElementId"
|
[uiId]="tjansterElementId"
|
||||||
uiLabel="Välj tjänster"
|
uiLabel="Välj tjänster"
|
||||||
uiPlaceholder="Välj tjänst"
|
uiPlaceholder="Välj tjänst"
|
||||||
|
|||||||
@@ -1,15 +1,9 @@
|
|||||||
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 { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
|
|
||||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { ReactiveFormsModule } from '@angular/forms';
|
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { TreeNodesSelectorModule } from '@msfa-shared/components/tree-nodes-selector/tree-nodes-selector.module';
|
|
||||||
import { EditEmployeeFormComponent } from './edit-employee-form.component';
|
import { EditEmployeeFormComponent } from './edit-employee-form.component';
|
||||||
|
import { EmployeeFormModule } from '../employee-form.module';
|
||||||
|
|
||||||
describe('EditEmployeeFormComponent', () => {
|
describe('EditEmployeeFormComponent', () => {
|
||||||
let component: EditEmployeeFormComponent;
|
let component: EditEmployeeFormComponent;
|
||||||
@@ -18,17 +12,7 @@ describe('EditEmployeeFormComponent', () => {
|
|||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
declarations: [EditEmployeeFormComponent],
|
declarations: [EditEmployeeFormComponent],
|
||||||
imports: [
|
imports: [HttpClientTestingModule, RouterTestingModule, EmployeeFormModule],
|
||||||
ReactiveFormsModule,
|
|
||||||
DigiNgFormInputModule,
|
|
||||||
DigiNgFormRadiobuttonGroupModule,
|
|
||||||
DigiNgFormDatepickerModule,
|
|
||||||
DigiNgPopoverModule,
|
|
||||||
DigiNgFormCheckboxModule,
|
|
||||||
HttpClientTestingModule,
|
|
||||||
TreeNodesSelectorModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
],
|
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ export class SlutredovisningFormStep3Component implements OnInit {
|
|||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.slutredovisning$ =
|
this.slutredovisning$ =
|
||||||
this.slutredovisningFormData.mainOccupation.type === MainOccupation.Work
|
this.slutredovisningFormData?.mainOccupation?.type === MainOccupation.Work
|
||||||
? this.slutredovisningFormService.yrkeToTextMap$.pipe(
|
? this.slutredovisningFormService.yrkeToTextMap$.pipe(
|
||||||
map(yrkeToText => this._formDataWithWorkToSlutredovisning(this.slutredovisningFormData, yrkeToText))
|
map(yrkeToText => this._formDataWithWorkToSlutredovisning(this.slutredovisningFormData, yrkeToText))
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
||||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
import { HandledarePickerFormComponent } from './handledare-picker-form.component';
|
import { HandledarePickerFormComponent } from './handledare-picker-form.component';
|
||||||
|
import { HandledarePickerFormModule } from '@msfa-shared/components/handledare-picker-form/handledare-picker-form.module';
|
||||||
|
|
||||||
describe('HandledarePickerFormComponent', () => {
|
describe('HandledarePickerFormComponent', () => {
|
||||||
let component: HandledarePickerFormComponent;
|
let component: HandledarePickerFormComponent;
|
||||||
@@ -10,7 +11,7 @@ describe('HandledarePickerFormComponent', () => {
|
|||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [ReactiveFormsModule, HttpClientTestingModule, FormsModule],
|
imports: [ReactiveFormsModule, HttpClientTestingModule, HandledarePickerFormModule],
|
||||||
declarations: [HandledarePickerFormComponent],
|
declarations: [HandledarePickerFormComponent],
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
import { OrganizationPickerFormComponent } from './organization-picker-form.component';
|
import { OrganizationPickerFormComponent } from './organization-picker-form.component';
|
||||||
|
import { OrganizationPickerFormModule } from '@msfa-shared/components/organization-picker-form/organization-picker-form.module';
|
||||||
|
|
||||||
describe('OrganizationPickerFormComponent', () => {
|
describe('OrganizationPickerFormComponent', () => {
|
||||||
let component: OrganizationPickerFormComponent;
|
let component: OrganizationPickerFormComponent;
|
||||||
@@ -9,7 +10,7 @@ describe('OrganizationPickerFormComponent', () => {
|
|||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [ReactiveFormsModule, FormsModule],
|
imports: [ReactiveFormsModule, OrganizationPickerFormModule],
|
||||||
declarations: [OrganizationPickerFormComponent],
|
declarations: [OrganizationPickerFormComponent],
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|||||||
Reference in New Issue
Block a user