From 3e73f59fd83d796da22a5c4748d8a0b21c05f1c0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 20 Aug 2024 11:06:23 +0200
Subject: [PATCH] OZG-6305 use jest-marbles
---
.../lib/organisations-einheit.service.spec.ts | 18 +++++++++---------
...sations-einheit-container.component.spec.ts | 3 ++-
.../resource/resource-search.service.spec.ts | 16 ++++++----------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts b/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
index ea311a2483..b1d9a7a651 100644
--- a/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
+++ b/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
@@ -1,7 +1,8 @@
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import faker from '@faker-js/faker';
-import { first, of } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { singleColdCompleted } from '../../../tech-shared/test/marbles';
import {
createOrganisationsEinheitListResource,
createOrganisationsEinheitResource,
@@ -81,14 +82,13 @@ describe('OrganisationsEinheitService', () => {
expect(searchService.getSelectedResult).toHaveBeenCalled();
});
- it('should return result', (done) => {
- service
- .getSelectedResult()
- .pipe(first())
- .subscribe((result: StateResource<OrganisationsEinheitResource>) => {
- expect(result).toBe(organisationsEinheitStateResource);
- done();
- });
+ it('should return result', () => {
+ const selectedResult$: Observable<StateResource<OrganisationsEinheitResource>> =
+ service.getSelectedResult();
+
+ expect(selectedResult$).toBeObservable(
+ singleColdCompleted(organisationsEinheitStateResource),
+ );
});
});
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 13f0d0a62d..49f71ddf42 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -11,7 +11,7 @@ import { DialogConfig, DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormControl } from '@angular/forms';
import { getUrl } from '@ngxp/rest';
-import { ButtonComponent } from '@ods/system';
+import { ButtonComponent, OfficeIconComponent } from '@ods/system';
import { createOrganisationsEinheitResource } from 'libs/collaboration-shared/test/organisations-einheit';
import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -40,6 +40,7 @@ describe('OrganisationsEinheitContainerComponent', () => {
declarations: [
OrganisationsEinheitContainerComponent,
MockComponent(SearchIconComponent),
+ MockComponent(OfficeIconComponent),
MockComponent(ButtonComponent),
MockComponent(OrganisationsEinheitComponent),
],
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
index d301de83a8..cec2eb392c 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
@@ -4,7 +4,8 @@ import faker from '@faker-js/faker';
import { Resource, getUrl } from '@ngxp/rest';
import { DummyLinkRel } from 'libs/tech-shared/test/dummy';
import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource';
-import { BehaviorSubject, first, of } from 'rxjs';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { singleColdCompleted } from '../../../test/marbles';
import { EMPTY_STRING } from '../tech.util';
import { ResourceSearchService } from './resource-search.service';
import { LinkRelationName, ListItemResource, SearchResourceServiceConfig } from './resource.model';
@@ -171,16 +172,11 @@ describe('ResourceSearchService', () => {
describe('get selected', () => {
const dummyStateResource: StateResource<Resource> = createStateResource(createDummyResource());
- it('should return selected resource', (done) => {
- service.selectedResource.next(dummyStateResource);
+ it('should return selected resource', () => {
+ service.getSelectedResult = jest.fn().mockReturnValue(of(dummyStateResource));
+ const selectedResult$: Observable<StateResource<Resource>> = service.getSelectedResult();
- service
- .getSelectedResult()
- .pipe(first())
- .subscribe((stateResource: StateResource<Resource>) => {
- expect(dummyStateResource).toBe(stateResource);
- done();
- });
+ expect(selectedResult$).toBeObservable(singleColdCompleted(dummyStateResource));
});
});
--
GitLab