fix test and merge conflict

Author: SimonEntholzer

src/test/javascript/spec/component/account/user-settings-container.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { of } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
@@ -9,45 +8,42 @@ import { UserSettingsContainerComponent } from 'app/shared/user-settings/user-se
 import { MockRouter } from '../../helpers/mocks/mock-router';
 import { AccountService } from 'app/core/auth/account.service';
 import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route';
+import { MockAccountService } from '../../helpers/mocks/service/mock-account.service';
 
 describe('UserSettingsContainerComponent', () => {
     let fixture: ComponentFixture<UserSettingsContainerComponent>;
     let comp: UserSettingsContainerComponent;
 
-    let accountServiceMock: { getAuthenticationState: jest.Mock; isAtLeastTutor: jest.Mock };
-
     let translateService: TranslateService;
+    let accountService: AccountService;
 
     const router = new MockRouter();
     router.setUrl('');
 
     beforeEach(async () => {
-        accountServiceMock = {
-            getAuthenticationState: jest.fn(() => of({ id: 13 } as any)),
-            isAtLeastTutor: jest.fn(() => true),
-        };
-
         await TestBed.configureTestingModule({
             imports: [UserSettingsContainerComponent],
             providers: [
                 { provide: TranslateService, useClass: MockTranslateService },
                 { provide: NgbModal, useClass: MockNgbModalService },
                 { provide: Router, useValue: router },
                 { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
-                { provide: AccountService, useValue: accountServiceMock },
+                { provide: AccountService, useClass: MockAccountService },
             ],
         }).compileComponents();
 
         fixture = TestBed.createComponent(UserSettingsContainerComponent);
         comp = fixture.componentInstance;
         translateService = TestBed.inject(TranslateService);
+        accountService = TestBed.inject(AccountService);
         translateService.currentLang = 'en';
     });
 
     it('should initialize with loaded user', () => {
+        const getAuthenticationSpy = jest.spyOn(accountService, 'getAuthenticationState');
         fixture.detectChanges();
-        expect(accountServiceMock.getAuthenticationState).toHaveBeenCalled();
-        expect(comp.currentUser?.id).toEqual(13);
-        expect(comp.isAtLeastTutor).toEqual(true);
+        expect(getAuthenticationSpy).toHaveBeenCalled();
+        expect(comp.currentUser?.id).toEqual(99);
+        expect(comp.isAtLeastTutor).toEqual(false);
     });
 });

src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts

@@ -17,14 +17,12 @@ import { ExerciseScoresComponent, FilterProp } from 'app/exercise/exercise-score
 import { ExerciseService } from 'app/exercise/exercise.service';
 import { ParticipationService } from 'app/exercise/participation/participation.service';
 import { ResultService } from 'app/exercise/result/result.service';
-import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { Range } from 'app/shared/util/utils';
 import dayjs from 'dayjs/esm';
 import { Subscription, of } from 'rxjs';
 import { MockCourseManagementService } from '../../../../helpers/mocks/service/mock-course-management.service';
 import { MockExerciseService } from '../../../../helpers/mocks/service/mock-exercise.service';
 import { MockParticipationService } from '../../../../helpers/mocks/service/mock-participation.service';
-import { MockProfileService } from '../../../../helpers/mocks/service/mock-profile.service';
 import { MockProgrammingSubmissionService } from '../../../../helpers/mocks/service/mock-programming-submission.service';
 import { MockResultService } from '../../../../helpers/mocks/service/mock-result.service';