arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 in TEA/mina-sidor-fa-web from fix-Fixed-some-failing-tests to develop

Browse Source 
Squashed commit of the following:

commit ff92c6bd63560c8e0dab6c711c09150fbaf7ce37
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:46:33 2021 +0200

    fix comments and type

commit 3d246398a3a4d5b0397cdfda7aa8b7e2f285303e
Merge: d4d00f4 91eeb1d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:43:11 2021 +0200

    Merge branch 'develop' into fix-Fixed-some-failing-tests

commit d4d00f447b8641167c5c6a19c64cb9303d5bd5e9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 14:11:24 2021 +0200

    Fix lint errors

commit 3b203efbc92380a9fadba1521c83c22debb49420
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 14:05:42 2021 +0200

    Fix failing tests & type fails

commit b26ab4e13aa646b90431608c697c9d40ca41e67d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 13:50:26 2021 +0200

    Fix: Fixed failing tests
This commit is contained in:
Daniel Appelgren
2021-09-21 10:46:49 +02:00
parent 91eeb1d8dc
commit 2dd9d3d39b
10 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mina-sidor-fa/src/app/shared/components/loader/loader.component.spec.ts
+5 -5
View File
@@ -1,18 +1,18 @@
/* tslint:disable:no-unused-variable */
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { LoaderComponent } from './loader.component';
describe('LoaderComponent', () => {
let component: LoaderComponent;
let fixture: ComponentFixture<LoaderComponent>;
beforeEach(async(() => {
void TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [LoaderComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
}));
});
beforeEach(() => {
fixture = TestBed.createComponent(LoaderComponent);
apps/mina-sidor-fa/src/app/shared/components/loader/loader.module.ts
+1 -2
View File
@@ -1,4 +1,3 @@
import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LoaderComponent } from './loader.component';
@@ -6,7 +5,7 @@ import { LoaderComponent } from './loader.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [LoaderComponent],
imports: [CommonModule, DigiNgDialogModule],
imports: [CommonModule],
exports: [LoaderComponent],
})
export class LoaderModule {}
apps/mina-sidor-fa/src/app/shared/components/multiselect/multiselect.component.spec.ts
+2
View File
@@ -1,6 +1,7 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MultiselectComponent } from './multiselect.component';
import { DropdownModule } from '@msfa-shared/components/dropdown/dropdown.module';
describe('MultiselectComponent', () => {
let component: MultiselectComponent;
@@ -8,6 +9,7 @@ describe('MultiselectComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [DropdownModule],
declarations: [MultiselectComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
apps/mina-sidor-fa/src/app/shared/components/multiselect/multiselect.component.ts
+3
View File
@@ -94,6 +94,9 @@ export class MultiselectComponent implements AfterViewInit, ControlValueAccessor
}
ngAfterViewInit(): void {
if (!this.dropdownRef) {
return;
}
this.dropdownRef.onOpen(() => {
// force refresh of selected options if it's reopened
this.selectedOptions = [...(this.selectedOptions || [])];