fix after rebase

puzzle · Dec 24, 2024 · dbfc0f6 · dbfc0f6
1 parent dfc9443
commit dbfc0f6
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 15 deletions.
diff --git a/frontend/src/app/components/keyresult-type/keyresult-type.component.spec.ts b/frontend/src/app/components/keyresult-type/keyresult-type.component.spec.ts
diff --git a/frontend/src/app/interceptors/oauth.interceptor.spec.ts b/frontend/src/app/interceptors/oauth.interceptor.spec.ts
diff --git a/frontend/src/app/interceptors/oauth.interceptor.ts b/frontend/src/app/interceptors/oauth.interceptor.ts
diff --git a/frontend/src/app/services/objective-menu-actions.service.spec.ts b/frontend/src/app/services/objective-menu-actions.service.spec.ts
@@ -28,17 +28,17 @@ describe('ObjectiveMenuActionsService', () => {
     specificMenuEntriesSpy = jest.spyOn(service as any, 'getSpecificMenuEntries');
   });
 
-  afterEach(() => {
-    expect(specificMenuEntriesSpy)
-      .toHaveBeenCalledTimes(1);
-  });
-
   it('should be created', () => {
     expect(service)
       .toBeTruthy();
   });
 
   describe('getMenu', () => {
+    afterEach(() => {
+      expect(specificMenuEntriesSpy)
+        .toHaveBeenCalledTimes(1);
+    });
+
     it('should return default and specific menu entries for an ongoing objective', () => {
       const spyOn = jest.spyOn(service as any, 'getOngoingMenuActions');
 
@@ -78,10 +78,6 @@ describe('ObjectiveMenuActionsService', () => {
       expect(spyOn)
         .toHaveBeenCalledTimes(1);
     });
-    afterEach(() => {
-        expect(specificMenuEntriesSpy)
-            .toHaveBeenCalledTimes(1);
-    });
   });
 
   describe('get correct release action', () => {

diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.html b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.html
diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.spec.ts b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.spec.ts
diff --git a/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.ts b/frontend/src/app/shared/dialog/example-dialog/example-dialog.component.ts
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
-import { ExampleDialogComponent } from './dialog/example-dialog/example-dialog.component';
 import { ObjectiveFormComponent } from './dialog/objective-dialog/objective-form.component';
 import { ConfirmDialogComponent } from './dialog/confirm-dialog/confirm-dialog.component';
 import { ScoringComponent } from './custom/scoring/scoring.component';
@@ -28,7 +27,6 @@ import { MatTooltip } from '@angular/material/tooltip';
 
 @NgModule({
   declarations: [
-    ExampleDialogComponent,
     ObjectiveFormComponent,
     ConfirmDialogComponent,
     UnitTransformationPipe,
@@ -62,7 +60,6 @@ import { MatTooltip } from '@angular/material/tooltip';
     MatTooltip
   ],
   exports: [
-    ExampleDialogComponent,
     ObjectiveFormComponent,
     ConfirmDialogComponent,
     ScoringComponent,

diff --git a/...src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts b/...src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts
@@ -123,13 +123,13 @@ describe('MemberListTableComponent', () => {
     tick();
 
     expect(teamServiceMock.removeUserFromTeam)
-      .toHaveBeenCalledWith(1);
+      .toHaveBeenCalledTimes(1);
     expect(teamServiceMock.removeUserFromTeam)
       .toHaveBeenCalledWith(entry.id, component.selectedTeam$.value);
     expect(userServiceMock.reloadUsers)
-      .toHaveBeenCalledWith(1);
+      .toHaveBeenCalledTimes(1);
     expect(userServiceMock.reloadCurrentUser)
-      .toHaveBeenCalledWith(1);
+      .toHaveBeenCalledTimes(1);
   }));
 
   it('removeMemberFromTeam should not call removeUserFromTeam and reloadUsers if not confirmed', fakeAsync(() => {