From 2cad56c51fd2e773e5bedb5a0b0fb2e370e50dad Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 28 Jun 2023 09:36:44 +0200
Subject: [PATCH] Fix tests

PaginationComponent: expected arguments of updateRoute were out of sync with (fixed) types
GroupFormComponent:  groupBeingEdited is never set to null
---
 .../group-registry/group-form/group-form.component.html   | 8 ++++----
 src/app/shared/pagination/pagination.component.spec.ts    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 99bc602229..2bd4041ba6 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -39,8 +39,8 @@
           <button (click)="onCancel()"
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
-        <div after *ngIf="groupBeingEdited !== null" class="btn-group">
-          <button class="btn btn-danger delete-button" [disabled]="(canEdit$ | async) === false || groupBeingEdited.permanent"
+        <div after *ngIf="groupBeingEdited !== undefined" class="btn-group">
+          <button class="btn btn-danger delete-button" [disabled]="(canEdit$ | async) === false || groupBeingEdited?.permanent"
                   (click)="delete()">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
           </button>
@@ -48,10 +48,10 @@
       </ds-form>
 
       <div class="mb-5">
-        <ds-members-list *ngIf="groupBeingEdited !== null"
+        <ds-members-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
       </div>
-      <ds-subgroups-list *ngIf="groupBeingEdited !== null"
+      <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
 
 
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index af15b32039..36b0313ddf 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -282,11 +282,11 @@ describe('Pagination component', () => {
 
       changePage(testFixture, 3);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '3' }), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 3 }), {},  false);
 
       changePage(testFixture, 0);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '2' }), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 2 }), {},  false);
     }));
 
     it('should set correct pageSize route parameters', fakeAsync(() => {
@@ -296,7 +296,7 @@ describe('Pagination component', () => {
 
       changePageSize(testFixture, '20');
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ pageId: 'test', page: 1, pageSize: 20 }), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 1, pageSize: 20 }), {},  false);
     }));
 
     it('should respond to windows resize', () => {