diff --git a/alfa-client/apps/info/src/pages/impressum/impressum-page-sh.component.ts b/alfa-client/apps/info/src/pages/impressum/impressum-page-sh.component.ts index 443387d3a3af5dba195f4eb173d3a965f8803605..8acecebc1451d3a3c545c4e8a018b4799aafd5c4 100644 --- a/alfa-client/apps/info/src/pages/impressum/impressum-page-sh.component.ts +++ b/alfa-client/apps/info/src/pages/impressum/impressum-page-sh.component.ts @@ -15,7 +15,7 @@ import { Component } from '@angular/core'; </p> <p> E-Mail: <br /> - <a href="mailto:digitalisierung@stk.landsh.de">digitalisierung@stk.landsh.de</a> + <a href="mailto:digitalisierung@stk.landsh.de">Digitalisierung@stk.landsh.de</a> </p> <p> Verantwortlich <br /> @@ -25,7 +25,7 @@ import { Component } from '@angular/core'; <p> E-Mail: <br /> - <a href="mailto:digitalisierung@stk.landsh.de">digitalisierung@stk.landsh.de</a> + <a href="mailto:digitalisierung@stk.landsh.de">Digitalisierung@stk.landsh.de</a> </p> </div>`, }) diff --git a/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.spec.ts b/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.spec.ts index 85d2c15b3fcd63e8b282c00f68a19083e3f48dba..ae9c56bedd57177e3bac765ec968d7d00660794d 100644 --- a/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.spec.ts +++ b/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.spec.ts @@ -31,7 +31,9 @@ import KcAdminClient from '@keycloak/keycloak-admin-client'; import GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation'; import MappingsRepresentation from '@keycloak/keycloak-admin-client/lib/defs/mappingsRepresentation'; import RoleRepresentation, { RoleMappingPayload } from '@keycloak/keycloak-admin-client/lib/defs/roleRepresentation'; +import { Users } from '@keycloak/keycloak-admin-client/lib/resources/users'; import { cold } from 'jest-marbles'; +import { omit } from 'lodash-es'; import { throwError } from 'rxjs'; import { createUser } from '../../../user-shared/test/user'; import { UserFormService } from '../../../user/src/lib/user-form/user.formservice'; @@ -42,9 +44,16 @@ describe('UserRepository', () => { let kcAdminClient: Mock<KcAdminClient>; const user: User = createUser(); + let kcAdminClientUsers: Mock<Users>; beforeEach(() => { - kcAdminClient = mock(KcAdminClient); + kcAdminClientUsers = { + ...mock(Users), + executeActionsEmail: jest.fn().mockImplementation(), + create: jest.fn().mockReturnValue(Promise.resolve({ id: user.id })), + }; + kcAdminClient = { ...mock(KcAdminClient), users: <any>kcAdminClientUsers }; + TestBed.configureTestingModule({ providers: [{ provide: KcAdminClient, useValue: kcAdminClient }], }); @@ -56,16 +65,10 @@ describe('UserRepository', () => { }); describe('createInKeycloak', () => { - beforeEach(() => { - kcAdminClient.users = <any>{ - create: jest.fn().mockReturnValue(Promise.resolve({ id: user.id })), - }; - }); - it('should call kcAdminClient users create', () => { repository.createInKeycloak(user); - expect(kcAdminClient.users['create']).toBeCalledWith(user); + expect(kcAdminClient.users['create']).toHaveBeenCalledWith(omit(user, 'groupIds')); }); it('should call addUserRoles', fakeAsync(() => { @@ -74,7 +77,7 @@ describe('UserRepository', () => { repository.createInKeycloak(user).subscribe(); tick(); - expect(repository._addUserRoles).toBeCalledWith(user.id, user.clientRoles); + expect(repository._addUserRoles).toHaveBeenCalledWith(user.id, user.clientRoles); })); it('should call sendActivationMail', (done) => { @@ -82,7 +85,7 @@ describe('UserRepository', () => { repository._addUserRoles = jest.fn().mockReturnValue(Promise.resolve()); repository.createInKeycloak(user).subscribe(() => { - expect(repository._sendActivationMail).toBeCalledWith(user.id); + expect(repository._sendActivationMail).toHaveBeenCalledWith(user.id); done(); }); }); @@ -111,19 +114,19 @@ describe('UserRepository', () => { it('should call kcAdminClient users update', () => { repository.saveInKeycloak(user); - expect(kcAdminClient.users['update']).toBeCalledWith({ id: user.id }, user); + expect(kcAdminClient.users['update']).toHaveBeenCalledWith({ id: user.id }, omit(user, 'groupIds')); }); it('should call addUserRoles', fakeAsync(() => { repository.saveInKeycloak(user).subscribe(); tick(); - expect(repository._addUserRoles).toBeCalledWith(user.id, user.clientRoles); + expect(repository._addUserRoles).toHaveBeenCalledWith(user.id, user.clientRoles); })); it('should call updateUserGroups', (done) => { repository.saveInKeycloak(user).subscribe(() => { - expect(repository._updateUserGroups).toBeCalledWith(user.id, user.groupIds); + expect(repository._updateUserGroups).toHaveBeenCalledWith(user.id, user.groupIds); done(); }); }); @@ -151,19 +154,19 @@ describe('UserRepository', () => { it('should call getOldUserGroups', async () => { await repository._updateUserGroups(user.id, user.groups); - expect(repository._getOldUserGroupIds).toBeCalled(); + expect(repository._getOldUserGroupIds).toHaveBeenCalled(); }); it('should call deleteUserGroups', async () => { await repository._updateUserGroups(user.id, user.groups); - expect(repository._deleteUserGroups).toBeCalledWith(user.id, user.groups, oldGroups); + expect(repository._deleteUserGroups).toHaveBeenCalledWith(user.id, user.groups, oldGroups); }); it('should call addUserGroups', async () => { await repository._updateUserGroups(user.id, user.groups); - expect(repository._addUserGroups).toBeCalledWith(user.id, user.groups, oldGroups); + expect(repository._addUserGroups).toHaveBeenCalledWith(user.id, user.groups, oldGroups); }); }); @@ -180,7 +183,7 @@ describe('UserRepository', () => { it('should call kcAdminClient users listGroups', async () => { await repository._getOldUserGroupIds(user.id); - expect(kcAdminClient.users['listGroups']).toBeCalledWith({ id: user.id }); + expect(kcAdminClient.users['listGroups']).toHaveBeenCalledWith({ id: user.id }); }); it('should return group ids', async () => { @@ -203,13 +206,13 @@ describe('UserRepository', () => { it('should call kcAdminClient users listGroups to be called', async () => { await repository._deleteUserGroups(user.id, newUserGroupIds, oldUserGroupIds); - expect(kcAdminClient.users['delFromGroup']).toBeCalledWith({ id: user.id, groupId: oldUserGroupIds[1] }); + expect(kcAdminClient.users['delFromGroup']).toHaveBeenCalledWith({ id: user.id, groupId: oldUserGroupIds[1] }); }); it('should call kcAdminClient users listGroups for every group to delete', async () => { await repository._deleteUserGroups(user.id, [], oldUserGroupIds); - expect(kcAdminClient.users['delFromGroup']).toBeCalledTimes(oldUserGroupIds.length); + expect(kcAdminClient.users['delFromGroup']).toHaveBeenCalledTimes(oldUserGroupIds.length); }); }); @@ -226,7 +229,7 @@ describe('UserRepository', () => { it('should call kcAdminClient users addToGroup', () => { repository._addUserGroups(user.id, newUserGroupIds, oldUserGroupIds); - expect(kcAdminClient.users['addToGroup']).toBeCalledWith({ id: user.id, groupId: newUserGroupIds[1] }); + expect(kcAdminClient.users['addToGroup']).toHaveBeenCalledWith({ id: user.id, groupId: newUserGroupIds[1] }); }); it('should call kcAdminClient users addToGroup for every group', () => { @@ -234,7 +237,7 @@ describe('UserRepository', () => { user.groups = groups; repository._addUserGroups(user.id, newUserGroupIds, []); - expect(kcAdminClient.users['addToGroup']).toBeCalledTimes(newUserGroupIds.length); + expect(kcAdminClient.users['addToGroup']).toHaveBeenCalledTimes(newUserGroupIds.length); }); }); @@ -244,7 +247,7 @@ describe('UserRepository', () => { await repository._addUserRoles(user.id, { admin: [UserFormService.ADMIN], alfa: [] }); - expect(repository._addUserRolesForClient).toBeCalledWith( + expect(repository._addUserRolesForClient).toHaveBeenCalledWith( user.id, [UserFormService.ADMIN], UserRepository.ADMIN_CLIENT_NAME, @@ -256,7 +259,7 @@ describe('UserRepository', () => { await repository._addUserRoles(user.id, { alfa: [UserFormService.POSTSTELLE], admin: [] }); - expect(repository._addUserRolesForClient).toBeCalledWith( + expect(repository._addUserRolesForClient).toHaveBeenCalledWith( user.id, [UserFormService.POSTSTELLE], UserRepository.ALFA_CLIENT_NAME, @@ -289,7 +292,7 @@ describe('UserRepository', () => { it('should call getClientId', async () => { await repository._addUserRolesForClient(user.id, [UserFormService.ADMIN], UserRepository.ADMIN_CLIENT_NAME); - expect(repository._getClientId).toBeCalled(); + expect(repository._getClientId).toHaveBeenCalled(); }); it('should call getAlfaClientId', async () => { @@ -317,7 +320,7 @@ describe('UserRepository', () => { it('should call kcAdminClient clients find', async () => { await repository._getClientId(UserRepository.ADMIN_CLIENT_NAME); - expect(kcAdminClient.clients['find']).toBeCalledWith({ clientId: UserRepository.ADMIN_CLIENT_NAME }); + expect(kcAdminClient.clients['find']).toHaveBeenCalledWith({ clientId: UserRepository.ADMIN_CLIENT_NAME }); }); it('should return clientId', async () => { @@ -344,7 +347,7 @@ describe('UserRepository', () => { it('should call kcAdminClient clients listRoles', async () => { await repository._mapUserRoles(clientId, userRoles); - expect(kcAdminClient.clients['listRoles']).toBeCalledWith({ id: clientId }); + expect(kcAdminClient.clients['listRoles']).toHaveBeenCalledWith({ id: clientId }); }); it('should return roleMapping', async () => { @@ -376,23 +379,17 @@ describe('UserRepository', () => { await repository._addUserRolesInKeycloak(user.id, clientId, roles); - expect(kcAdminClient.users['addClientRoleMappings']).toBeCalledWith({ id: user.id, clientUniqueId: clientId, roles }); + expect(kcAdminClient.users['addClientRoleMappings']).toHaveBeenCalledWith({ id: user.id, clientUniqueId: clientId, roles }); }); }); describe('sendActivationMail', () => { - beforeEach(() => { - kcAdminClient.users = <any>{ - executeActionsEmail: jest.fn().mockReturnValue(Promise.resolve()), - }; - }); - it('should call kcAdminClient users executeActionsEmail', () => { const userId: string = faker.string.uuid(); repository._sendActivationMail(userId); - expect(kcAdminClient.users['executeActionsEmail']).toBeCalledWith({ + expect(kcAdminClientUsers.executeActionsEmail).toHaveBeenCalledWith({ id: userId, actions: ['VERIFY_EMAIL'], lifespan: 3600 * 24 * 7, @@ -414,7 +411,7 @@ describe('UserRepository', () => { const error: Error = new Error('error'); const result = repository._handleSaveError(error); - expect(result).toBeObservable(cold('#', null, new Error('An error occurred while patching the user.'))); + expect(result).toBeObservable(cold('#', null, new Error('An error occurred while saving the user.'))); }); }); @@ -453,21 +450,21 @@ describe('UserRepository', () => { repository.getUsers().subscribe(); tick(); - expect(repository._mapToUser).toBeCalledTimes(userArray.length); + expect(repository._mapToUser).toHaveBeenCalledTimes(userArray.length); })); it('should call kcadminClient listGroups for every user', fakeAsync(() => { repository.getUsers().subscribe(); tick(); - expect(kcAdminClient.users['listGroups']).toBeCalledTimes(userArray.length); + expect(kcAdminClient.users['listGroups']).toHaveBeenCalledTimes(userArray.length); })); it('should call kcadminClient listRoleMappings for every user', fakeAsync(() => { repository.getUsers().subscribe(); tick(); - expect(kcAdminClient.users['listRoleMappings']).toBeCalledTimes(userArray.length); + expect(kcAdminClient.users['listRoleMappings']).toHaveBeenCalledTimes(userArray.length); })); it('should return users with groups and roles', (done) => { @@ -515,21 +512,21 @@ describe('UserRepository', () => { it('should call kcAdminClient users findOne', () => { repository.getUserById(user.id); - expect(kcAdminClient.users['findOne']).toBeCalledWith({ id: user.id }); + expect(kcAdminClient.users['findOne']).toHaveBeenCalledWith({ id: user.id }); }); it('should call kcAdminClient users listGroups', fakeAsync(() => { repository.getUserById(user.id).subscribe(); tick(); - expect(kcAdminClient.users['listGroups']).toBeCalledWith({ id: user.id }); + expect(kcAdminClient.users['listGroups']).toHaveBeenCalledWith({ id: user.id }); })); it('should call kcAdminClient users listRoleMappings', fakeAsync(() => { repository.getUserById(user.id).subscribe(); tick(); - expect(kcAdminClient.users['listRoleMappings']).toBeCalledWith({ id: user.id }); + expect(kcAdminClient.users['listRoleMappings']).toHaveBeenCalledWith({ id: user.id }); })); it('should return user with groups and roles', (done) => { diff --git a/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts b/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts index f299f51d720fb8438c22f0fb114434fecd37009d..130176623c25c1cf1f848643b0a5687906fbae34 100644 --- a/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts +++ b/alfa-client/libs/admin/keycloak-shared/src/lib/user.repository.ts @@ -148,7 +148,7 @@ export class UserRepository { _handleSaveError(err: any): Observable<never> { console.error('Error on patch user in Keycloak:', err); - return throwError(() => new Error('An error occurred while patching the user.')); + return throwError(() => new Error('An error occurred while saving the user.')); } public getUsers(): Observable<User[]> { diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts index 995bfd1a0aaab32d118d524b2aad934752457e40..d799453d615d41bd0e21b7940461d59c7131adf0 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts @@ -1359,14 +1359,19 @@ describe('BescheidService', () => { it('should upload file', (done) => { service.uploadAttachment(bescheidResource, file).subscribe(() => { - expect(binaryFileService.uploadFile).toBeCalledWith(bescheidResource, BescheidLinkRel.UPLOAD_ATTACHMENT, file, false); + expect(binaryFileService.uploadFile).toHaveBeenCalledWith( + bescheidResource, + BescheidLinkRel.UPLOAD_ATTACHMENT, + file, + false, + ); done(); }); }); it('should handle attachment upload', (done) => { service.uploadAttachment(bescheidResource, file).subscribe(() => { - expect(service.handleAttachmentUpload).toBeCalledWith(binaryFileStateResource); + expect(service.handleAttachmentUpload).toHaveBeenCalledWith(binaryFileStateResource); done(); }); }); diff --git a/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.spec.ts b/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.spec.ts index 05eb9e49c06ecdc641672a33f31760984dd15714..de1242c608e560f453c76ee160ddaf89dc3b9b0c 100644 --- a/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.spec.ts +++ b/alfa-client/libs/design-component/src/lib/button-with-spinner/button-with-spinner.component.spec.ts @@ -22,10 +22,7 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { - createCommandErrorStateResource, - createCommandResource, -} from 'libs/command-shared/test/command'; +import { createCommandErrorStateResource, createCommandResource } from 'libs/command-shared/test/command'; import { createApiError } from 'libs/tech-shared/test/error'; import { ButtonWithSpinnerComponent } from './button-with-spinner.component'; @@ -55,7 +52,7 @@ describe('ButtonWithSpinnerComponent', () => { component.ngOnInit(); - expect(component.getStateResource).toBeCalled(); + expect(component.getStateResource).toHaveBeenCalled(); }); }); diff --git a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts index c655b7df689e980d84fbf897a9f3b28c649fe416..c5c54a6669c048bc0c1dda16aa7b5680009b9ecf 100644 --- a/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts +++ b/alfa-client/libs/design-system/src/lib/icons/edit-icon/edit-icon.component.ts @@ -32,9 +32,9 @@ import { iconVariants, IconVariants } from '../iconVariants'; imports: [CommonModule], template: `<svg viewBox="0 0 24 24" - fill="none" xmlns="http://www.w3.org/2000/svg" [ngClass]="twMerge(iconVariants({ size }), 'fill-primary', class)" + aria-hidden="true" > <path d="M5 19H6.425L16.2 9.225L14.775 7.8L5 17.575V19ZM3 21V16.75L16.2 3.575C16.4 3.39167 16.6208 3.25 16.8625 3.15C17.1042 3.05 17.3583 3 17.625 3C17.8917 3 18.15 3.05 18.4 3.15C18.65 3.25 18.8667 3.4 19.05 3.6L20.425 5C20.625 5.18333 20.7708 5.4 20.8625 5.65C20.9542 5.9 21 6.15 21 6.4C21 6.66667 20.9542 6.92083 20.8625 7.1625C20.7708 7.40417 20.625 7.625 20.425 7.825L7.25 21H3ZM15.475 8.525L14.775 7.8L16.2 9.225L15.475 8.525Z" diff --git a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.spec.ts b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.spec.ts index 9777813705006f3f026f47d31d792f6b663a31da..44794b0072f9b661cd22120938e0a045e9b5d330 100644 --- a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.spec.ts +++ b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.spec.ts @@ -21,14 +21,11 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { KommentarListLinkRel, KommentarService } from '@alfa-client/kommentar-shared'; import { createStateResource } from '@alfa-client/tech-shared'; import { mock } from '@alfa-client/test-utils'; -import { - ExpansionPanelComponent, - OzgcloudStrokedButtonWithSpinnerComponent, -} from '@alfa-client/ui'; +import { ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { cold } from 'jest-marbles'; import { MockComponent } from 'ng-mocks'; import { Observable } from 'rxjs'; @@ -77,13 +74,7 @@ describe('KommentarListInVorgangContainerComponent', () => { beforeEach(() => { kommentarService.isFormularVisible.mockReturnValue(new Observable((o) => o.next(false))); kommentarService.getKommentareByVorgang.mockReturnValue( - new Observable((o) => - o.next( - createStateResource( - createKommentarListResource([KommentarListLinkRel.CREATE_KOMMENTAR]), - ), - ), - ), + new Observable((o) => o.next(createStateResource(createKommentarListResource([KommentarListLinkRel.CREATE_KOMMENTAR])))), ); }); @@ -96,21 +87,15 @@ describe('KommentarListInVorgangContainerComponent', () => { it('should call kommentar service getKommentareByVorgang', () => { component.ngOnChanges(); - expect(kommentarService.getKommentareByVorgang).toHaveBeenCalledWith( - component.vorgangStateResource.resource, - ); + expect(kommentarService.getKommentareByVorgang).toHaveBeenCalledWith(component.vorgangStateResource.resource); }); it('should create new Kommentare', () => { const canCreateNewKommentar$ = cold('a', { a: true }); const kommentarListStateResource = createStateResource(createKommentarListResource()); - const kommentarListStateResource$ = new Observable((observer) => - observer.next(kommentarListStateResource), - ); + const kommentarListStateResource$ = new Observable((observer) => observer.next(kommentarListStateResource)); kommentarService.getKommentareByVorgang.mockReturnValue(kommentarListStateResource$); - kommentarService.canCreateNewKommentar.mockReturnValue( - new Observable((observer) => observer.next(true)), - ); + kommentarService.canCreateNewKommentar.mockReturnValue(new Observable((observer) => observer.next(true))); component.ngOnChanges(); @@ -120,13 +105,9 @@ describe('KommentarListInVorgangContainerComponent', () => { it('should not create new Kommentare', () => { const canCreateNewKommentar$ = cold('a', { a: false }); const kommentarListStateResource = createStateResource(createKommentarListResource()); - const kommentarListStateResource$ = new Observable((observer) => - observer.next(kommentarListStateResource), - ); + const kommentarListStateResource$ = new Observable((observer) => observer.next(kommentarListStateResource)); kommentarService.getKommentareByVorgang.mockReturnValue(kommentarListStateResource$); - kommentarService.canCreateNewKommentar.mockReturnValue( - new Observable((observer) => observer.next(false)), - ); + kommentarService.canCreateNewKommentar.mockReturnValue(new Observable((observer) => observer.next(false))); component.ngOnChanges(); @@ -134,9 +115,7 @@ describe('KommentarListInVorgangContainerComponent', () => { }); it('should call reloadKommentarListOnVorgangReload', () => { - const reloadKommentarListOnVorgangReload = jest - .spyOn(component, 'reloadKommentarListOnVorgangReload') - .mockReturnThis(); + const reloadKommentarListOnVorgangReload = jest.spyOn(component, 'reloadKommentarListOnVorgangReload').mockReturnThis(); component.ngOnChanges(); @@ -157,7 +136,7 @@ describe('KommentarListInVorgangContainerComponent', () => { component.reloadKommentarListOnVorgangReload(); - expect(kommentarService.setKommentarListReload).toBeCalled(); + expect(kommentarService.setKommentarListReload).toHaveBeenCalled(); }); it('should not call kommentarService', () => { @@ -168,7 +147,7 @@ describe('KommentarListInVorgangContainerComponent', () => { component.reloadKommentarListOnVorgangReload(); - expect(kommentarService.setKommentarListReload).not.toBeCalled(); + expect(kommentarService.setKommentarListReload).not.toHaveBeenCalled(); }); }); diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.spec.ts index 28f1fb5afaa51040ea3792acb1dcf4f0a0f408fc..f2b47f34a70349440a1b12df07830044472fc724 100644 --- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.spec.ts +++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.spec.ts @@ -21,23 +21,21 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PostfachService } from '@alfa-client/postfach-shared'; +import { createStateResource, StateResource } from '@alfa-client/tech-shared'; import { mock } from '@alfa-client/test-utils'; import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent } from 'ng-mocks'; import { PostfachMailListContainerComponent } from './postfach-mail-list-container.component'; import { PostfachMailListComponent } from './postfach-mail-list/postfach-mail-list.component'; -import { createStateResource, StateResource } from '@alfa-client/tech-shared'; describe('PostfachMailListContainerComponent', () => { let component: PostfachMailListContainerComponent; let fixture: ComponentFixture<PostfachMailListContainerComponent>; - const vorgangStateResource: StateResource<VorgangWithEingangResource> = createStateResource( - createVorgangWithEingangResource(), - ); + const vorgangStateResource: StateResource<VorgangWithEingangResource> = createStateResource(createVorgangWithEingangResource()); const postfachService = mock(PostfachService); @@ -68,9 +66,7 @@ describe('PostfachMailListContainerComponent', () => { it('should call postfach service', () => { component.ngOnChanges(); - expect(postfachService.getPostfachMailListByGivenVorgang).toHaveBeenCalledWith( - vorgangStateResource.resource, - ); + expect(postfachService.getPostfachMailListByGivenVorgang).toHaveBeenCalledWith(vorgangStateResource.resource); }); it('should call reloadPostfachMailListOnVorgangReload', () => { @@ -97,7 +93,7 @@ describe('PostfachMailListContainerComponent', () => { component.reloadPostfachMailListOnVorgangReload(); - expect(postfachService.setPostfachMailOnReload).toBeCalled(); + expect(postfachService.setPostfachMailOnReload).toHaveBeenCalled(); }); it('should not call postfachService', () => { @@ -108,7 +104,7 @@ describe('PostfachMailListContainerComponent', () => { component.reloadPostfachMailListOnVorgangReload(); - expect(postfachService.setPostfachMailOnReload).not.toBeCalled(); + expect(postfachService.setPostfachMailOnReload).not.toHaveBeenCalled(); }); }); }); diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts index 5b331dc5ef8056bb702847a8ec0f2c1c41800254..7a045fa7514ae98cf24c58209a709551fb0def98 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts @@ -285,7 +285,7 @@ describe('ResourceService', () => { it('should call isLoadingRequired', () => { service.shouldLoadResource(stateResource, configResource); - expect(isLoadingRequiredSpy).toBeCalledWith(stateResource); + expect(isLoadingRequiredSpy).toHaveBeenCalledWith(stateResource); }); it('should return false if configresource exists but loading is NOT required', () => { diff --git a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts index e194369bd484ef328aee42181528720d510a38b6..e2000c8388d7734d74f703d0748d531580e7454d 100644 --- a/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts +++ b/alfa-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts @@ -21,12 +21,12 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ +import { ConvertForDataTestPipe } from '@alfa-client/tech-shared'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgControl, ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ConvertForDataTestPipe } from '@alfa-client/tech-shared'; import { MockComponent } from 'ng-mocks'; import { ValidationErrorComponent } from '../../validation-error/validation-error.component'; import { TextEditorComponent } from './text-editor.component'; @@ -39,11 +39,7 @@ describe('TextEditorComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - TextEditorComponent, - ConvertForDataTestPipe, - MockComponent(ValidationErrorComponent), - ], + declarations: [TextEditorComponent, ConvertForDataTestPipe, MockComponent(ValidationErrorComponent)], imports: [MatFormFieldModule, MatInputModule, ReactiveFormsModule, BrowserAnimationsModule], providers: [ { @@ -81,7 +77,7 @@ describe('TextEditorComponent', () => { component.onClear(); - expect(component.writeValue).toBeCalledWith(null); + expect(component.writeValue).toHaveBeenCalledWith(null); }); }); diff --git a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-dropdown/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.spec.ts b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-dropdown/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.spec.ts index a48bf0572e2f8850044ea6f0c9bcb00e676511ad..847eb89e25387f795a36720c5ed61e90de627939 100644 --- a/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-dropdown/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.spec.ts +++ b/alfa-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-dropdown/user-settings-email-benachrichtigung-container/user-settings-email-benachrichtigung/user-settings-email-benachrichtigung.component.spec.ts @@ -118,8 +118,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { }); it('should call return true if notificationsSendFor is ALL', () => { - component.userSettings.resource[UserNotificationsTypes.NOTIFICATIONS_SEND_FOR] = - NotificationSendForTypes.ALL; + component.userSettings.resource[UserNotificationsTypes.NOTIFICATIONS_SEND_FOR] = NotificationSendForTypes.ALL; const result: boolean = component.isChecked(UserNotificationsTypes.NOTIFICATIONS_SEND_FOR); @@ -127,8 +126,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { }); it('should call return false if notificationsSendFor is NONE', () => { - component.userSettings.resource[UserNotificationsTypes.NOTIFICATIONS_SEND_FOR] = - NotificationSendForTypes.NONE; + component.userSettings.resource[UserNotificationsTypes.NOTIFICATIONS_SEND_FOR] = NotificationSendForTypes.NONE; const result: boolean = component.isChecked(UserNotificationsTypes.NOTIFICATIONS_SEND_FOR); @@ -161,7 +159,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { component.emitSettingsForVorgangCreated(true); - expect(valueChangedEmitter.emit).toBeCalledWith({ + expect(valueChangedEmitter.emit).toHaveBeenCalledWith({ ...settings, [UserNotificationsTypes.VORGANGE_CREATED]: true, [UserNotificationsTypes.NOTIFICATIONS_SEND_FOR]: NotificationSendForTypes.ALL, @@ -174,7 +172,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { component.emitSettingsForVorgangCreated(false); - expect(valueChangedEmitter.emit).toBeCalledWith({ + expect(valueChangedEmitter.emit).toHaveBeenCalledWith({ ...settings, [UserNotificationsTypes.VORGANGE_CREATED]: false, [UserNotificationsTypes.NOTIFICATIONS_SEND_FOR]: NotificationSendForTypes.NONE, @@ -189,7 +187,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { component.emitSettings(UserNotificationsTypes.WIEDERVORLAGE_DUE_TODAY, true); - expect(valueChangedEmitter.emit).toBeCalledWith({ + expect(valueChangedEmitter.emit).toHaveBeenCalledWith({ ...settings, [UserNotificationsTypes.WIEDERVORLAGE_DUE_TODAY]: true, }); @@ -201,7 +199,7 @@ describe('UserSettingsEmailBenachrichtigungComponent', () => { component.emitSettings(UserNotificationsTypes.WIEDERVORLAGE_DUE_TODAY, false); - expect(valueChangedEmitter.emit).toBeCalledWith({ + expect(valueChangedEmitter.emit).toHaveBeenCalledWith({ ...settings, [UserNotificationsTypes.WIEDERVORLAGE_DUE_TODAY]: false, }); diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts index 38daf67265460873bf9f585af1fbe5b81bfbf6a0..ebf2fa64f17b56d95828a63bb475020d4178ab76 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts @@ -204,7 +204,7 @@ describe('AktenzeichenEditDialogComponent', () => { component.onSubmit(); component.setAktenzeichenPending$.subscribe(() => { - expect(component.onResponse).toBeCalledWith(null); + expect(component.onResponse).toHaveBeenCalledWith(null); done(); }); }); @@ -212,9 +212,7 @@ describe('AktenzeichenEditDialogComponent', () => { it('should emit state resource', () => { component.onSubmit(); - expect(component.setAktenzeichenPending$).toBeObservable( - cold('a', { a: { resource: null } }), - ); + expect(component.setAktenzeichenPending$).toBeObservable(cold('a', { a: { resource: null } })); }); }); }); diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.formservice.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.formservice.spec.ts index ed1292255cab2935d4ecd06096f9633e08b68545..7a4da00189c7a8b1ae85d52d6b796bfc86311862 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.formservice.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.formservice.spec.ts @@ -71,6 +71,6 @@ describe('doSubmit', () => { service.submit(); - expect(vorgangService.setAktenzeichen).toBeCalledWith(vorgang, 'aktenzeichen'); + expect(vorgangService.setAktenzeichen).toHaveBeenCalledWith(vorgang, 'aktenzeichen'); }); }); diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html index 3f94a6da451f1731445c8b37487d6dfc03eb0fe6..e56be799f110d811aa849ebd4db4709e7c644307 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html @@ -24,13 +24,17 @@ --> <div class="flex flex-shrink" alfa-aktenzeichen [vorgang]="vorgang"></div> -<ng-container *ngIf="vorgang | hasLink: linkRel.SET_AKTENZEICHEN"> - <div class="relative w-12"> - <ozgcloud-icon-button-primary - svgIcon="edit" +@if (vorgang | hasLink: linkRel.SET_AKTENZEICHEN) { + <div class="relative"> + <ods-button + class="absolute -top-2" + variant="ghost" + size="fit" tooltip="Aktenzeichen bearbeiten" data-test-id="aktenzeichen-editieren" (clickEmitter)="onEdit()" - ></ozgcloud-icon-button-primary> + > + <ods-edit-icon icon /> + </ods-button> </div> -</ng-container> +} diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss deleted file mode 100644 index dbb9218a330a285d37db355ff911cac5a991f9a9..0000000000000000000000000000000000000000 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ - -// Workaround Material's fixed 48px height -:host ::ng-deep ozgcloud-icon-button-primary button { - position: absolute; - top: -14px; -} diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts index ff9fac80cc66eab370ef4677e805fe24aa697c8e..11982ed18070cf1894cabf09fdf2cb958c9970ff 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts @@ -22,11 +22,13 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { HasLinkPipe } from '@alfa-client/tech-shared'; -import { mock } from '@alfa-client/test-utils'; -import { DialogService, OzgcloudIconButtonPrimaryComponent } from '@alfa-client/ui'; +import { existsAsHtmlElement, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils'; +import { DialogService } from '@alfa-client/ui'; import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { AktenzeichenComponent } from '@alfa-client/vorgang-shared-ui'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ButtonComponent, EditIconComponent } from '@ods/system'; +import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent } from 'ng-mocks'; import { AktenzeichenEditDialogComponent } from '../aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component'; @@ -36,6 +38,8 @@ describe('AktenzeichenComponent', () => { let component: AktenzeichenEditableComponent; let fixture: ComponentFixture<AktenzeichenEditableComponent>; + const editButton: string = getDataTestIdOf('aktenzeichen-editieren'); + const dialogService = mock(DialogService); beforeEach(async () => { @@ -43,7 +47,8 @@ describe('AktenzeichenComponent', () => { declarations: [ HasLinkPipe, AktenzeichenEditableComponent, - MockComponent(OzgcloudIconButtonPrimaryComponent), + MockComponent(ButtonComponent), + MockComponent(EditIconComponent), MockComponent(AktenzeichenComponent), ], providers: [ @@ -79,12 +84,8 @@ describe('AktenzeichenComponent', () => { }); describe('after render', () => { - it('should render edit button', () => { - const editIcon = fixture.nativeElement.querySelector('ozgcloud-icon-button-primary'); - - fixture.detectChanges(); - - expect(editIcon).not.toBeInstanceOf(HTMLElement); + it('should NOT render edit button', () => { + notExistsAsHtmlElement(fixture, editButton); }); it('should render edit button', () => { @@ -94,8 +95,7 @@ describe('AktenzeichenComponent', () => { fixture.detectChanges(); - const editIcon = fixture.nativeElement.querySelector('ozgcloud-icon-button-primary'); - expect(editIcon).toBeInstanceOf(HTMLElement); + existsAsHtmlElement(fixture, editButton); }); }); }); diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.ts index 0b7c225ce89af017ffe0f15b00511cd859deb0e8..383891cf573dac67b7462abdc92f4c5650e735d2 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.ts @@ -21,15 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { Component, Input } from '@angular/core'; -import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { DialogService } from '@alfa-client/ui'; +import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; +import { Component, Input } from '@angular/core'; import { AktenzeichenEditDialogComponent } from '../aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component'; @Component({ selector: 'alfa-aktenzeichen-editable', templateUrl: './aktenzeichen-editable.component.html', - styleUrls: ['./aktenzeichen-editable.component.scss'], }) export class AktenzeichenEditableComponent { @Input() vorgang: VorgangWithEingangResource; diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts index 4587f44e185a15ca05bcb07b10be2d7af21aeadf..eb653d5117ca99f5b3374f86d4ab240ca1d5e6f3 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts @@ -202,7 +202,7 @@ describe('BescheidenButtonComponent', () => { it('should init', () => { component.openBescheidenWizard(); - expect(bescheidService.init).toBeCalled(); + expect(bescheidService.init).toHaveBeenCalled(); }); it('should open bescheiden dialog with existing draft', () => { diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html index 86f3e7c9a0014a5b079b345cab3f07eeaa7c51ea..06d40e9f4dac876238cb2e0d262fc0502b34a3e2 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html @@ -48,7 +48,7 @@ {{ vorgang.name }} </h2> <alfa-vorgang-nummer class="vorgang-nummer" [vorgang]="vorgang"></alfa-vorgang-nummer> - <div class="flex flex-1 flex-row gap-1"> + <div class="flex flex-1 flex-row items-center gap-1"> <div class="flex flex-shrink-0" [class.text-gray-400]="!hasAktenzeichen"> <mat-icon svgIcon="az" style="width: 1.5rem; height: 1.5rem"></mat-icon> </div> diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts index c0c50286c433c3f46979dde35495922f968f0ecd..b976d702d642721c317985fad672a8fe7b94fd48 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts @@ -130,7 +130,7 @@ describe('VorgangDetailBescheidenComponent', () => { component.ngOnInit(); - expect(setVorgangWithEingangResource).toBeCalledWith(vorgangWithEingangResource); + expect(setVorgangWithEingangResource).toHaveBeenCalledWith(vorgangWithEingangResource); }); it('should patch values', () => { @@ -138,7 +138,7 @@ describe('VorgangDetailBescheidenComponent', () => { component.ngOnInit(); - expect(patchValues).toBeCalledWith(bescheidDraftResource); + expect(patchValues).toHaveBeenCalledWith(bescheidDraftResource); }); it('should call handleEscapeKey', () => { diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts index 80f44530361cdf53dd965955ab0b0d7ed1b39968..32aba2314074dfd4c1db59679594e9cd00767f4e 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts @@ -161,6 +161,7 @@ const routes: Routes = [ ButtonCardComponent, UndoIconComponent, CloseIconComponent, + EditIconComponent, ExclamationIconComponent, SaveIconComponent, SendIconComponent, diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts index 0d1bc4a5bceb917e806223ba1d7e986c9c9a6135..dc36503b5bfad9cf24da093b76846f480b92bac2 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts @@ -195,7 +195,7 @@ describe('VorgangSearchComponent', () => { component.vorgangSearchPreviewList = vorgangList; - expect(component.buildSearchResultPreviewLabel).toBeCalledWith(vorgangList); + expect(component.buildSearchResultPreviewLabel).toHaveBeenCalledWith(vorgangList); }); it('should set previewLabel', () => { diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts index ab918999111af08299caac6135e57299bea939b7..0aa3ead988609bc5416e593f13cfdf6e44bd8a6e 100644 --- a/alfa-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts +++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts @@ -84,13 +84,13 @@ describe('VorgangService', () => { it('should get vorgangWithEingang', () => { service.getVorgangWithEingang(); - expect(facade.getVorgangWithEingang).toBeCalled(); + expect(facade.getVorgangWithEingang).toHaveBeenCalled(); }); it('should get getApiRoot', () => { service.getVorgangWithEingang(); - expect(apiRootService.getApiRoot).toBeCalled(); + expect(apiRootService.getApiRoot).toHaveBeenCalled(); }); describe('initial', () => { diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.spec.ts index b9593d70d1dd13e81b06f1d1d30855eb164bccd4..305ae85a3562debef815c485cc0820e6971e9139 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.spec.ts +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.spec.ts @@ -21,19 +21,15 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; import { createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared'; import { mock } from '@alfa-client/test-utils'; import { VorgangResource } from '@alfa-client/vorgang-shared'; import { WiedervorlageService } from '@alfa-client/wiedervorlage-shared'; -import { - createVorgangResource, - createVorgangWithEingangResource, -} from 'libs/vorgang-shared/test/vorgang'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; import { MockComponent } from 'ng-mocks'; import { WiedervorlageListInVorgangContainerComponent } from './wiedervorlage-list-in-vorgang-container.component'; import { WiedervorlageListInVorgangComponent } from './wiedervorlage-list-in-vorgang/wiedervorlage-list-in-vorgang.component'; -import { KommentarListInVorgangContainerComponent } from '@alfa-client/kommentar'; describe('WiedervorlageListInVorgangContainerComponent', () => { let component: WiedervorlageListInVorgangContainerComponent; @@ -41,8 +37,7 @@ describe('WiedervorlageListInVorgangContainerComponent', () => { const wiedervorlageService = mock(WiedervorlageService); - const vorgangStateResource: StateResource<VorgangResource> = - createStateResource(createVorgangResource()); + const vorgangStateResource: StateResource<VorgangResource> = createStateResource(createVorgangResource()); beforeEach(async () => { await TestBed.configureTestingModule({ @@ -75,9 +70,7 @@ describe('WiedervorlageListInVorgangContainerComponent', () => { it('should call wiedervorlageService to get wiedervorlageList', () => { component.ngOnChanges(); - expect(wiedervorlageService.getWiedervorlageListByGivenVorgang).toHaveBeenCalledWith( - vorgangStateResource.resource, - ); + expect(wiedervorlageService.getWiedervorlageListByGivenVorgang).toHaveBeenCalledWith(vorgangStateResource.resource); }); it('should call reloadWiedervorlageListOnVorgangReload', () => { @@ -104,7 +97,7 @@ describe('WiedervorlageListInVorgangContainerComponent', () => { component.reloadWiedervorlageListOnVorgangReload(); - expect(wiedervorlageService.setWiedervorlageListReload).toBeCalled(); + expect(wiedervorlageService.setWiedervorlageListReload).toHaveBeenCalled(); }); it('should not call wiedervorlageService', () => { @@ -115,7 +108,7 @@ describe('WiedervorlageListInVorgangContainerComponent', () => { component.reloadWiedervorlageListOnVorgangReload(); - expect(wiedervorlageService.setWiedervorlageListReload).not.toBeCalled(); + expect(wiedervorlageService.setWiedervorlageListReload).not.toHaveBeenCalled(); }); }); });