Merge pull request #55 in TEA/dafa-web-monorepo from feature/TV-366 to develop

Squashed commit of the following: commit 41f27ba3701d7b690e941f2038676218facaab84 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:40:44 2021 +0200 TV-366 removed redundant import commit f31d3d6545375e2c84254a60b9e072333fddaa80 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:38:41 2021 +0200 TV-366 made a bunch of changes in accordance with the feedback from the current pull request. commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5 Merge: 721b58e e712f2f Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:10:28 2021 +0200 Co-authored-by: af-aden <af-aden@users.noreply.github.com> commit 721b58e1767c465673cb817414e1410b403f5e60 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 18 10:16:40 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts # apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts # apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82 Merge: fbda233 218e3d6 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 18 09:41:54 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 commit fbda233782a0850edb5e23b50f0030486a15effe Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:50:08 2021 +0200 TV-366 removing stored selected organization when logging out. commit ed51909892cd92f180f6785635f85c735ec3f129 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:05:14 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 # Conflicts: # apps/dafa-web/src/app/shared/services/api/user.service.ts commit 6a77f2497aec71d174c719d27c6d5c644ba53fed Merge: 17f643d 6d29baa Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:04:22 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 commit 17f643d18abcbdbfe12a91a63179278d559fdba5 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 17:35:59 2021 +0200 TV-366 First version od organization-picker
2021-08-19 08:17:59 +02:00
parent 639109ad10
commit d4874d6cd5
33 changed files with 409 additions and 597 deletions
@@ -1,6 +1,7 @@
 /* tslint:disable:no-unused-variable */
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { BackLinkComponent } from './back-link.component';

 describe('BackLinkComponent', () => {
@@ -11,6 +12,7 @@ describe('BackLinkComponent', () => {
    void TestBed.configureTestingModule({
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
      declarations: [BackLinkComponent],
+      imports: [RouterTestingModule],
    }).compileComponents();
  }));

@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '../icon/icon.component';
 import { HideTextComponent } from './hide-text.component';

 describe('HideTextComponent', () => {
@@ -7,7 +8,7 @@ describe('HideTextComponent', () => {

  beforeEach(async () => {
    await TestBed.configureTestingModule({
-      declarations: [HideTextComponent],
+      declarations: [HideTextComponent, IconComponent],
    }).compileComponents();
  });

@@ -1,3 +1,4 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { IconModule } from '@msfa-shared/components/icon/icon.module';
@@ -12,6 +13,7 @@ describe('NavigationComponent', () => {
      void TestBed.configureTestingModule({
        declarations: [NavigationComponent],
        imports: [RouterTestingModule, IconModule],
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
      }).compileComponents();
    })
  );