From 62c7905146e6c90cf751efbc86cd3b53fee918c7 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Thu, 20 Feb 2025 17:43:32 +0100
Subject: [PATCH] OZG-7510 adjustment after refactor model
---
.../postfach-shared/src/lib/postfach.service.spec.ts | 5 +++--
.../settings-shared/src/lib/settings.service.spec.ts | 8 ++++----
.../settings-shared/src/lib/settings.util.spec.ts | 10 +++++-----
.../libs/admin/settings-shared/test/settings.ts | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
index d779cb50dc..2441dc06db 100644
--- a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
+++ b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
@@ -21,6 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { SettingItem } from '@admin-client/settings-shared';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
import { SnackBarService } from '@alfa-client/ui';
@@ -31,7 +32,7 @@ import { singleCold, singleHot } from 'libs/tech-shared/test/marbles';
import { Observable, of } from 'rxjs';
import { createPostfachResource, createPostfachSettingItem } from '../test/postfach';
import { PostfachResourceService } from './postfach-resource.service';
-import { PostfachResource, PostfachSettingsItem } from './postfach.model';
+import { Postfach, PostfachResource } from './postfach.model';
import { PostfachService } from './postfach.service';
describe('PostfachService', () => {
@@ -78,7 +79,7 @@ describe('PostfachService', () => {
});
describe('save', () => {
- const postfachSettingsItem: PostfachSettingsItem = createPostfachSettingItem();
+ const postfachSettingsItem: SettingItem<Postfach> = createPostfachSettingItem();
const postfachResource: PostfachResource = createPostfachResource();
const postfachStateResource: StateResource<PostfachResource> = createStateResource(postfachResource);
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
index df43dad69e..1cf23c3571 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
@@ -51,8 +51,8 @@ describe('SettingsService', () => {
describe('get by setting name', () => {
const settingItemName: SettingName = <SettingName>'DUMMY';
- const settingItemResource: SettingItemResource = { ...createSettingItemResource(), name: settingItemName };
- const settingItemStateResource: StateResource<SettingItemResource> = createStateResource(settingItemResource);
+ const settingItemResource: SettingItemResource<unknown> = { ...createSettingItemResource(), name: settingItemName };
+ const settingItemStateResource: StateResource<SettingItemResource<unknown>> = createStateResource(settingItemResource);
const settingsListResource: StateResource<SettingListResource> = createStateResource(
createSettingsListResource([settingItemResource]),
);
@@ -73,7 +73,7 @@ describe('SettingsService', () => {
);
settingListResourceService.getList = jest.fn().mockReturnValue(singleCold(emptySettingsListResource));
- const settingItemStateResource$: Observable<StateResource<SettingItemResource>> = service.get(settingItemName);
+ const settingItemStateResource$: Observable<StateResource<SettingItemResource<unknown>>> = service.get(settingItemName);
expect(settingItemStateResource$).toBeObservable(singleCold(createEmptyStateResource()));
});
@@ -81,7 +81,7 @@ describe('SettingsService', () => {
it('should return item resource as setting item resource', () => {
settingListResourceService.getList = jest.fn().mockReturnValue(singleCold(settingsListResource));
- const settingItemStateResource$: Observable<StateResource<SettingItemResource>> = service.get(settingItemName);
+ const settingItemStateResource$: Observable<StateResource<SettingItemResource<unknown>>> = service.get(settingItemName);
expect(settingItemStateResource$).toBeObservable(singleCold(settingItemStateResource));
});
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
index a84eccc40f..fe8480f147 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
@@ -25,18 +25,18 @@ import { createEmptyStateResource, createStateResource, StateResource } from '@a
import { Resource } from '@ngxp/rest';
import { createFilledSettingsListResource, createSettingItemResource } from '../../test/settings';
import { SettingItemResource, SettingListResource, SettingName } from './settings.model';
-import { getSettingItem } from './settings.util';
+import { getSettingItemResource } from './settings.util';
-describe('get setting resource', () => {
+describe('get setting item resource', () => {
const settingName: SettingName = <SettingName>'DUMMY';
it('should return matching setting resource as state resource if exists', () => {
- const settingItemResource: SettingItemResource = { ...createSettingItemResource(), name: settingName };
+ const settingItemResource: SettingItemResource<unknown> = { ...createSettingItemResource(), name: settingName };
const settingsListResource: StateResource<SettingListResource> = createStateResource(
createFilledSettingsListResource([settingItemResource]),
);
- const stateResource: StateResource<Resource> = getSettingItem(settingsListResource, settingName);
+ const stateResource: StateResource<Resource> = getSettingItemResource(settingsListResource, settingName);
expect(stateResource.resource).toEqual(settingItemResource);
});
@@ -44,7 +44,7 @@ describe('get setting resource', () => {
it('should return empty state resource if no matching resource exists', () => {
const settingsListResource: StateResource<SettingListResource> = createStateResource(createFilledSettingsListResource([]));
- const stateResource: StateResource<Resource> = getSettingItem(settingsListResource, settingName);
+ const stateResource: StateResource<Resource> = getSettingItemResource(settingsListResource, settingName);
expect(stateResource).toEqual(createEmptyStateResource());
});
diff --git a/alfa-client/libs/admin/settings-shared/test/settings.ts b/alfa-client/libs/admin/settings-shared/test/settings.ts
index 95cb75fa5c..a7bf1ded5b 100644
--- a/alfa-client/libs/admin/settings-shared/test/settings.ts
+++ b/alfa-client/libs/admin/settings-shared/test/settings.ts
@@ -4,7 +4,7 @@ import { toResource } from 'libs/tech-shared/test/resource';
import { SettingListLinkRel } from '../src/lib/settings.linkrel';
import { SettingItemResource, SettingListResource } from '../src/lib/settings.model';
-export function createSettingsListResource(settingsItems: SettingItemResource[]): SettingListResource {
+export function createSettingsListResource(settingsItems: SettingItemResource<unknown>[]): SettingListResource {
return toResource({}, [], {
settings: settingsItems,
});
@@ -16,7 +16,7 @@ export function createFilledSettingsListResource(resources: Resource[], linkRela
});
}
-export function createSettingItemResource(): SettingItemResource {
+export function createSettingItemResource(): SettingItemResource<unknown> {
return toResource({
name: faker.word.sample(),
settingBody: {},
--
GitLab