From 3974bc9a90c16bc25a80c7cbbf24129672ab0270 Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Thu, 6 Feb 2025 00:21:09 +0100 Subject: [PATCH 1/5] remove usage of mock modules used in test --- ...tem-notification-management.component.spec.ts | 3 +-- .../code-editor-header.component.spec.ts | 5 ++--- .../competency-accordion.component.spec.ts | 3 +-- ...tency-recommendation-detail.component.spec.ts | 4 +--- .../import/competency-search.component.spec.ts | 3 +-- .../course/course-overview.component.spec.ts | 16 ++++------------ .../exam/manage/exam-import.component.spec.ts | 3 +-- .../modeling-exam-submission.component.spec.ts | 3 +-- .../quiz-exam-submission.component.spec.ts | 3 +-- .../git-diff-report.component.spec.ts | 3 +-- .../iris-settings-update-component.spec.ts | 12 ++---------- .../course-conversations.component.spec.ts | 14 ++++++-------- .../course-wide-search.component.spec.ts | 5 ++--- .../channels-overview-dialog.component.spec.ts | 5 ++--- .../conversation-member-row.component.spec.ts | 5 ++--- .../conversation-members.component.spec.ts | 5 ++--- ...conversation-thread-sidebar.component.spec.ts | 3 +-- .../build-plan-editor.component.spec.ts | 3 +-- .../component/shared/navbar.component.spec.ts | 5 +---- ...dmin-import-standardized-competencies.spec.ts | 3 +-- .../detail/knowledge-area-edit.component.spec.ts | 3 +-- .../detail/standardized-competency-edit.spec.ts | 3 +-- .../tutorial-group-detail.component.spec.ts | 5 ++--- ...torial-group-sessions-table.component.spec.ts | 3 +-- .../tutorial-groups-table.component.spec.ts | 5 ++--- 25 files changed, 41 insertions(+), 84 deletions(-) diff --git a/src/test/javascript/spec/component/admin/system-notification-management/system-notification-management.component.spec.ts b/src/test/javascript/spec/component/admin/system-notification-management/system-notification-management.component.spec.ts index 1b23535ce20f..bf007abad3e2 100644 --- a/src/test/javascript/spec/component/admin/system-notification-management/system-notification-management.component.spec.ts +++ b/src/test/javascript/spec/component/admin/system-notification-management/system-notification-management.component.spec.ts @@ -13,7 +13,6 @@ import { SortDirective } from 'app/shared/sort/sort.directive'; import { ItemCountComponent } from 'app/shared/pagination/item-count.component'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { MockRouterLinkDirective } from '../../../helpers/mocks/directive/mock-router-link.directive'; -import { NgbPaginationMocksModule } from '../../../helpers/mocks/directive/ngbPaginationMocks.module'; import '@angular/localize/init'; describe('SystemNotificationManagementComponent', () => { @@ -31,7 +30,7 @@ describe('SystemNotificationManagementComponent', () => { router.setUrl(''); await TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbPaginationMocksModule], + imports: [ArtemisTestModule], declarations: [ SystemNotificationManagementComponent, MockPipe(ArtemisDatePipe), diff --git a/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts index 5858695beba7..4d656c62d342 100644 --- a/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts +++ b/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts @@ -1,7 +1,6 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code-editor/header/code-editor-header.component'; import { ArtemisTestModule } from '../../test.module'; -import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; import { MAX_TAB_SIZE } from 'app/shared/monaco-editor/monaco-editor.component'; @@ -11,7 +10,7 @@ describe('CodeEditorHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbDropdownMocksModule], + imports: [ArtemisTestModule], declarations: [], providers: [], }) diff --git a/src/test/javascript/spec/component/competencies/competency-accordion.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-accordion.component.spec.ts index 2c9bbcfcb5f7..9ec6a8f66ea1 100644 --- a/src/test/javascript/spec/component/competencies/competency-accordion.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-accordion.component.spec.ts @@ -3,7 +3,6 @@ import { TranslateService } from '@ngx-translate/core'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { CompetencyAccordionComponent } from 'app/course/competencies/competency-accordion/competency-accordion.component'; import { CompetencyRingsComponent } from 'app/course/competencies/competency-rings/competency-rings.component'; import { CompetencyMetrics, ExerciseInformation, ExerciseMetrics, LectureUnitInformation, LectureUnitStudentMetricsDTO, StudentMetrics } from 'app/entities/student-metrics.model'; @@ -16,7 +15,7 @@ describe('CompetencyAccordionComponent', () => { let component: CompetencyAccordionComponent; beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule], + imports: [], declarations: [CompetencyAccordionComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockComponent(CompetencyRingsComponent)], providers: [MockProvider(TranslateService)], schemas: [], diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts index b97f8099cd1d..eb6c9c1ad60d 100644 --- a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts @@ -6,8 +6,6 @@ import { ArtemisTestModule } from '../../../test.module'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { CompetencyTaxonomy } from 'app/entities/competency.model'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; -import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module'; import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; @@ -20,7 +18,7 @@ describe('CompetencyRecommendationDetailComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule, NgbCollapseMocksModule], + imports: [ArtemisTestModule, ReactiveFormsModule], declarations: [ CompetencyRecommendationDetailComponent, ButtonComponent, diff --git a/src/test/javascript/spec/component/competencies/import/competency-search.component.spec.ts b/src/test/javascript/spec/component/competencies/import/competency-search.component.spec.ts index 8c301d8bd43c..f5c602a7c308 100644 --- a/src/test/javascript/spec/component/competencies/import/competency-search.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/import/competency-search.component.spec.ts @@ -3,7 +3,6 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockPipe } from 'ng-mocks'; import { CompetencySearchComponent } from 'app/course/competencies/import/competency-search.component'; -import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module'; import { ButtonComponent } from 'app/shared/components/button.component'; import { ArtemisFormsModule } from '../../../../../../main/webapp/app/forms/artemis-forms.module'; import { CourseCompetencyFilter } from 'app/shared/table/pageable-table'; @@ -14,7 +13,7 @@ describe('CompetencySearchComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ArtemisFormsModule, NgbCollapseMocksModule], + imports: [ArtemisTestModule, ArtemisFormsModule], declarations: [CompetencySearchComponent, MockPipe(ArtemisTranslatePipe), ButtonComponent], providers: [], }) diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts index 49a92b5402fc..5cc7bedd416f 100644 --- a/src/test/javascript/spec/component/course/course-overview.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.component.spec.ts @@ -1,7 +1,7 @@ import { FeatureToggleHideDirective } from 'app/shared/feature-toggle/feature-toggle-hide.directive'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; -import { EMPTY, Observable, Subject, of, throwError } from 'rxjs'; -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { EMPTY, Observable, of, Subject, throwError } from 'rxjs'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ArtemisTestModule } from '../../test.module'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; @@ -54,7 +54,6 @@ import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local- import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; -import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; import { CourseSidebarService } from 'app/overview/course-sidebar.service'; const endDate1 = dayjs().add(1, 'days'); @@ -164,14 +163,7 @@ describe('CourseOverviewComponent', () => { router = new MockRouter(); TestBed.configureTestingModule({ - imports: [ - RouterModule.forRoot([]), - ArtemisTestModule, - MockModule(MatSidenavModule), - MockModule(NgbTooltipModule), - MockModule(BrowserAnimationsModule), - NgbDropdownMocksModule, - ], + imports: [RouterModule.forRoot([]), ArtemisTestModule, MockModule(MatSidenavModule), MockModule(NgbTooltipModule), MockModule(BrowserAnimationsModule), ,], declarations: [ CourseOverviewComponent, MockDirective(MockHasAnyAuthorityDirective), @@ -207,7 +199,7 @@ describe('CourseOverviewComponent', () => { { provide: NotificationService, useClass: MockNotificationService }, { provide: LocalStorageService, useClass: MockLocalStorageService }, { provide: SessionStorageService, useClass: MockSyncStorage }, - { provide: NgbDropdown, useClass: NgbDropdownMocksModule }, + { provide: NgbDropdown, useClass: MockDirective(NgbDropdown) }, ], }) .compileComponents() diff --git a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts index b0476cd518fe..32165efc987d 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts @@ -19,7 +19,6 @@ import { SortByDirective } from 'app/shared/sort/sort-by.directive'; import { SortDirective } from 'app/shared/sort/sort.directive'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { of, throwError } from 'rxjs'; -import { NgbPaginationMocksModule } from '../../../helpers/mocks/directive/ngbPaginationMocks.module'; import { ArtemisTestModule } from '../../../test.module'; import { UMLDiagramType } from '@ls1intum/apollon'; @@ -42,7 +41,7 @@ describe('Exam Import Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, FormsModule, NgbPaginationMocksModule], + imports: [ArtemisTestModule, FormsModule], declarations: [ ExamImportComponent, ExamExerciseImportComponent, diff --git a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts index 5b2845a76b22..57df208881dd 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts @@ -15,7 +15,6 @@ import { TranslatePipeMock } from '../../../../helpers/mocks/service/mock-transl import { ArtemisTestModule } from '../../../../test.module'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.component'; -import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { ExerciseSaveButtonComponent } from 'app/exam/participate/exercises/exercise-save-button/exercise-save-button.component'; import { TranslateDirective } from '../../../../../../../main/webapp/app/shared/language/translate.directive'; @@ -41,7 +40,7 @@ describe('ModelingExamSubmissionComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], declarations: [ ModelingExamSubmissionComponent, MockComponent(ModelingEditorComponent), diff --git a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts index e3e9c1a94556..196ca9ee321f 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts @@ -19,7 +19,6 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { MultipleChoiceQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component'; import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component'; import { ShortAnswerQuestionComponent } from 'app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component'; -import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; @@ -50,7 +49,7 @@ describe('QuizExamSubmissionComponent', () => { shortAnswerQuestion.id = 3; return TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule], + imports: [], declarations: [ QuizExamSubmissionComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/git-diff-report/git-diff-report.component.spec.ts b/src/test/javascript/spec/component/git-diff-report/git-diff-report.component.spec.ts index 8e8a531d3a1b..a1df4a70ea0d 100644 --- a/src/test/javascript/spec/component/git-diff-report/git-diff-report.component.spec.ts +++ b/src/test/javascript/spec/component/git-diff-report/git-diff-report.component.spec.ts @@ -6,7 +6,6 @@ import { GitDiffLineStatComponent } from '../../../../../main/webapp/app/exercis import { GitDiffReportComponent } from '../../../../../main/webapp/app/exercises/programming/git-diff-report/git-diff-report.component'; import { ProgrammingExerciseGitDiffReport } from '../../../../../main/webapp/app/entities/programming-exercise-git-diff-report.model'; import { ProgrammingExerciseGitDiffEntry } from '../../../../../main/webapp/app/entities/programming-exercise-git-diff-entry.model'; -import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { GitDiffFilePanelComponent } from '../../../../../main/webapp/app/exercises/programming/git-diff-report/git-diff-file-panel.component'; describe('ProgrammingExerciseGitDiffReport Component', () => { @@ -15,7 +14,7 @@ describe('ProgrammingExerciseGitDiffReport Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], declarations: [GitDiffReportComponent, MockPipe(ArtemisTranslatePipe), MockComponent(GitDiffFilePanelComponent), MockComponent(GitDiffLineStatComponent)], providers: [], }).compileComponents(); diff --git a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts index 28cd7c9a34d3..131849230900 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { IrisSettingsUpdateComponent } from 'app/iris/settings/iris-settings-update/iris-settings-update.component'; import { IrisCourseSettings, IrisExerciseSettings, IrisGlobalSettings, IrisSettings, IrisSettingsType } from 'app/entities/iris/settings/iris-settings.model'; @@ -11,7 +11,6 @@ import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.serv import { firstValueFrom, of } from 'rxjs'; import { IrisCourseSettingsUpdateComponent } from 'app/iris/settings/iris-course-settings-update/iris-course-settings-update.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { NgbTooltipMockDirective } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { MockJhiTranslateDirective } from '../../../helpers/mocks/directive/mock-jhi-translate-directive.directive'; import { HttpResponse, provideHttpClient } from '@angular/common/http'; import { provideHttpClientTesting } from '@angular/common/http/testing'; @@ -48,14 +47,7 @@ describe('IrisSettingsUpdateComponent', () => { }; TestBed.configureTestingModule({ - imports: [ - ArtemisTestModule, - NgbTooltipMockDirective, - MockJhiTranslateDirective, - IrisCourseSettingsUpdateComponent, - IrisSettingsUpdateComponent, - IrisCommonSubSettingsUpdateComponent, - ], + imports: [ArtemisTestModule, , MockJhiTranslateDirective, IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, IrisCommonSubSettingsUpdateComponent], declarations: [MockPipe(ArtemisTranslatePipe), MockComponent(ButtonComponent)], providers: [MockProvider(IrisSettingsService, irisSettingsServiceMock), provideHttpClient(), provideHttpClientTesting()], }) diff --git a/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts index c49badd8c72e..43fbdc702dad 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts @@ -1,9 +1,9 @@ import { CourseConversationsComponent } from 'app/overview/course-conversations/course-conversations.component'; -import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { OneToOneChatDTO } from '../../../../../../main/webapp/app/entities/metis/conversation/one-to-one-chat.model'; import { generateExampleChannelDTO, generateExampleGroupChatDTO, generateOneToOneChatDTO } from './helpers/conversationExampleModels'; -import { MockComponent, MockPipe, MockProvider, MockInstance } from 'ng-mocks'; +import { MockComponent, MockInstance, MockPipe, MockProvider } from 'ng-mocks'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { LoadingIndicatorContainerStubComponent } from '../../../helpers/stubs/loading-indicator-container-stub.component'; import { ConversationHeaderComponent } from 'app/overview/course-conversations/layout/conversation-header/conversation-header.component'; @@ -12,8 +12,8 @@ import { ConversationMessagesComponent } from 'app/overview/course-conversations import { ConversationThreadSidebarComponent } from 'app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component'; import { Course } from 'app/entities/course.model'; import { BehaviorSubject, EMPTY, of } from 'rxjs'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ActivatedRoute, Params, Router, convertToParamMap } from '@angular/router'; +import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { MetisService } from 'app/shared/metis/metis.service'; import { Post } from 'app/entities/metis/post.model'; @@ -24,14 +24,12 @@ import { MockMetisService } from '../../../helpers/mocks/service/mock-metis-serv import { ButtonComponent } from 'app/shared/components/button.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { getElement } from '../../../helpers/utils/general.utils'; import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; import { CourseOverviewService } from 'app/overview/course-overview.service'; import { GroupChatCreateDialogComponent } from 'app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component'; -import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; + import { SidebarEventService } from 'app/shared/sidebar/sidebar-event.service'; import { SidebarAccordionComponent } from 'app/shared/sidebar/sidebar-accordion/sidebar-accordion.component'; import { GroupChatDTO } from 'app/entities/metis/conversation/group-chat.model'; @@ -130,7 +128,7 @@ examples.forEach((activeConversation) => { MockProvider(ProfileService), { provide: LayoutService, useValue: MockLayoutService }, ], - imports: [FormsModule, ReactiveFormsModule, FontAwesomeModule, NgbModule, NgbCollapseMocksModule, NgbTooltipMocksModule], + imports: [FormsModule, ReactiveFormsModule, FontAwesomeModule, NgbModule], }).compileComponents(); const metisService = new MockMetisService(); diff --git a/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts index 9037f8a262f8..eef33afe05e4 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/course-wide-search.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { Directive, EventEmitter, Input, Output } from '@angular/core'; import { CourseWideSearchComponent, CourseWideSearchConfig } from 'app/overview/course-conversations/course-wide-search/course-wide-search.component'; import { MetisService } from 'app/shared/metis/metis.service'; @@ -18,7 +18,6 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { PostSortCriterion, SortDirection } from 'app/shared/metis/metis.util'; import { metisExamChannelDTO, metisExerciseChannelDTO, metisGeneralChannelDTO, metisLectureChannelDTO } from '../../../helpers/sample/metis-sample-data'; import { getElement } from '../../../helpers/utils/general.utils'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @Directive({ @@ -58,7 +57,7 @@ describe('CourseWideSearchComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, NgbTooltipMocksModule], + imports: [FormsModule, ReactiveFormsModule], declarations: [ CourseWideSearchComponent, InfiniteScrollStubDirective, diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts index afdbd63c5895..d746fcb8b8a0 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { ChannelAction, ChannelsOverviewDialogComponent } from 'app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component'; import { initializeDialog } from '../dialog-test-helpers'; import { Course } from 'app/entities/course.model'; @@ -15,7 +15,6 @@ import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { HttpResponse } from '@angular/common/http'; import { By } from '@angular/platform-browser'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { NgbCollapseMocksModule } from '../../../../../helpers/mocks/directive/ngbCollapseMocks.module'; import { MockTranslateService } from '../../../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { ChannelItemComponent } from 'app/overview/course-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component'; @@ -48,7 +47,7 @@ examples.forEach((exampleChannel) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [NgbCollapseMocksModule], + imports: [], declarations: [ChannelsOverviewDialogComponent, LoadingIndicatorContainerStubComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)], providers: [ MockProvider(ChannelService), diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts index 6d7361ee432f..26b8af97ca27 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ConversationMemberRowComponent } from 'app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -21,7 +21,6 @@ import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { isGroupChatDTO } from 'app/entities/metis/conversation/group-chat.model'; import { By } from '@angular/platform-browser'; -import { NgbDropdownMocksModule } from '../../../../../../../../helpers/mocks/directive/ngbDropdownMocks.module'; import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component'; import { input, runInInjectionContext } from '@angular/core'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @@ -61,7 +60,7 @@ examples.forEach((activeConversation) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipModule, NgbDropdownMocksModule], + imports: [NgbTooltipModule], declarations: [ ConversationMemberRowComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.spec.ts index 662004a4eb50..3f8cf7513ba7 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import '@angular/localize/init'; import { ConversationMembersComponent } from 'app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component'; @@ -19,7 +19,6 @@ import { of } from 'rxjs'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ConversationAddUsersDialogComponent } from 'app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component'; import { defaultSecondLayerDialogOptions } from 'app/overview/course-conversations/other/conversation.util'; -import { NgbPaginationMocksModule } from '../../../../../../../helpers/mocks/directive/ngbPaginationMocks.module'; import { MockTranslateService } from '../../../../../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @@ -39,7 +38,7 @@ examples.forEach((activeConversation) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, NgbPaginationMocksModule], + imports: [FormsModule, ReactiveFormsModule], declarations: [ ConversationMembersComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.spec.ts index 62b4d505977f..5ba2911ceffd 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.spec.ts @@ -7,7 +7,6 @@ import { PostComponent } from 'app/shared/metis/post/post.component'; import { MessageReplyInlineInputComponent } from 'app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component'; import { Post } from 'app/entities/metis/post.model'; import { post } from '../../../../../helpers/sample/metis-sample-data'; -import { NgbTooltipMocksModule } from '../../../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @@ -17,7 +16,7 @@ describe('ConversationThreadSidebarComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule], + imports: [], declarations: [ ConversationThreadSidebarComponent, MockComponent(FaIconComponent), diff --git a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts index b629be2732b0..1aedaee8f474 100644 --- a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts @@ -13,7 +13,6 @@ import { MockBuildPlanService } from '../../helpers/mocks/service/mock-build-pla import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code-editor/header/code-editor-header.component'; import { MockComponent } from 'ng-mocks'; import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component'; -import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; @@ -33,7 +32,7 @@ describe('Build Plan Editor', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], declarations: [ BuildPlanEditorComponent, TranslatePipeMock, diff --git a/src/test/javascript/spec/component/shared/navbar.component.spec.ts b/src/test/javascript/spec/component/shared/navbar.component.spec.ts index 5de3b28f3e38..1520410fbb1e 100644 --- a/src/test/javascript/spec/component/shared/navbar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/navbar.component.spec.ts @@ -31,9 +31,6 @@ import dayjs from 'dayjs/esm'; import { StudentExam } from 'app/entities/student-exam.model'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { SystemNotificationComponent } from 'app/shared/notification/system-notification/system-notification.component'; -import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; -import { NgbCollapseMocksModule } from '../../helpers/mocks/directive/ngbCollapseMocks.module'; -import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; @@ -95,7 +92,7 @@ describe('NavbarComponent', () => { beforeEach(() => { return TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule, NgbCollapseMocksModule, NgbDropdownMocksModule], + imports: [], declarations: [ NavbarComponent, MockDirective(HasAnyAuthorityDirective), diff --git a/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts b/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts index e4269f1682ab..9aeb1780cd21 100644 --- a/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts @@ -5,7 +5,6 @@ import { AdminImportStandardizedCompetenciesComponent } from 'app/admin/standard import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { KnowledgeAreaTreeStubComponent } from './knowledge-area-tree-stub.component'; import { ButtonComponent } from 'app/shared/components/button.component'; -import { NgbCollapseMocksModule } from '../../helpers/mocks/directive/ngbCollapseMocks.module'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { AlertService } from 'app/core/util/alert.service'; @@ -29,7 +28,7 @@ describe('AdminImportStandardizedCompetenciesComponent', () => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], providers: [ - NgbCollapseMocksModule, + , MockPipe(HtmlForMarkdownPipe), KnowledgeAreaTreeStubComponent, MockComponent(ButtonComponent), diff --git a/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts b/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts index da3219405bd2..ba8073a69d1e 100644 --- a/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts @@ -8,7 +8,6 @@ import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component'; import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { KnowledgeAreaDTO } from 'app/entities/competency/standardized-competency.model'; import { By } from '@angular/platform-browser'; @@ -38,7 +37,7 @@ describe('KnowledgeAreaEditComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule, ReactiveFormsModule], declarations: [ KnowledgeAreaEditComponent, MockComponent(ButtonComponent), diff --git a/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts b/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts index 35d65359675f..0bf68860165b 100644 --- a/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts @@ -9,7 +9,6 @@ import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component'; import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { KnowledgeAreaDTO, StandardizedCompetencyDTO } from 'app/entities/competency/standardized-competency.model'; import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @@ -41,7 +40,7 @@ describe('StandardizedCompetencyEditComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule, ReactiveFormsModule], declarations: [ StandardizedCompetencyEditComponent, MockComponent(ButtonComponent), diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts index d328058634da..7215223625b6 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-detail.component.spec.ts @@ -8,7 +8,6 @@ import { ChangeDetectorRef, Component, Input, ViewChild } from '@angular/core'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { SortService } from 'app/shared/service/sort.service'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component'; import { RemoveSecondsPipe } from 'app/course/tutorial-groups/shared/remove-seconds.pipe'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; @@ -60,7 +59,7 @@ describe('TutorialGroupDetailWrapperTest', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule, RouterModule.forRoot([])], + imports: [RouterModule.forRoot([])], declarations: [ TutorialGroupDetailComponent, MockWrapperComponent, @@ -113,7 +112,7 @@ describe('TutorialGroupDetailComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgbTooltipMocksModule, RouterModule.forRoot([])], + imports: [RouterModule.forRoot([])], declarations: [ TutorialGroupDetailComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts index 0577e8472dd8..e0ac6b2ac0de 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts @@ -10,7 +10,6 @@ import dayjs from 'dayjs/esm'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; -import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTestModule } from '../../../test.module'; import { provideHttpClient } from '@angular/common/http'; @@ -116,7 +115,7 @@ describe('TutorialGroupSessionTableComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbCollapseMocksModule], + imports: [ArtemisTestModule], declarations: [ TutorialGroupSessionsTableComponent, TutorialGroupSessionRowStubComponent, diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts index 745ca1c21531..394c7b231479 100644 --- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts @@ -14,7 +14,6 @@ import { TutorialGroupRowStubComponent } from '../stubs/tutorial-groups-table-st import { Course, Language } from 'app/entities/course.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { runOnPushChangeDetection } from '../../../helpers/on-push-change-detection.helper'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTestModule } from '../../../test.module'; @@ -64,7 +63,7 @@ describe('TutorialGroupTableWrapperTest', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], declarations: [ TutorialGroupsTableComponent, TutorialGroupRowStubComponent, @@ -124,7 +123,7 @@ describe('TutorialGroupsTableComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], providers: [MockProvider(SortService), MockProvider(ActivatedRoute)], }) .compileComponents() From 391f8118b7358b287bae6218c096574e4082325e Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Thu, 6 Feb 2025 00:30:10 +0100 Subject: [PATCH 2/5] fix admin-import-standardized-competencies.spec.ts --- .../admin-import-standardized-competencies.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts b/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts index 9aeb1780cd21..c1490d940aa0 100644 --- a/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts +++ b/src/test/javascript/spec/component/standardized-competencies/admin-import-standardized-competencies.spec.ts @@ -28,7 +28,6 @@ describe('AdminImportStandardizedCompetenciesComponent', () => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], providers: [ - , MockPipe(HtmlForMarkdownPipe), KnowledgeAreaTreeStubComponent, MockComponent(ButtonComponent), From bc840052e8814f68a48068778bb78f288f4bde8b Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Thu, 6 Feb 2025 00:31:42 +0100 Subject: [PATCH 3/5] delete mock modules --- .../course-description-form.component.spec.ts | 3 +- .../component/shared/result.component.spec.ts | 6 +-- .../mocks/directive/ngbAlertsMocks.module.ts | 19 ------- .../directive/ngbCollapseMocks.module.ts | 26 --------- .../directive/ngbDropdownMocks.module.ts | 52 ------------------ .../directive/ngbPaginationMocks.module.ts | 54 ------------------- .../mocks/directive/ngbTooltipMocks.module.ts | 39 -------------- 7 files changed, 3 insertions(+), 196 deletions(-) delete mode 100644 src/test/javascript/spec/helpers/mocks/directive/ngbAlertsMocks.module.ts delete mode 100644 src/test/javascript/spec/helpers/mocks/directive/ngbCollapseMocks.module.ts delete mode 100644 src/test/javascript/spec/helpers/mocks/directive/ngbDropdownMocks.module.ts delete mode 100644 src/test/javascript/spec/helpers/mocks/directive/ngbPaginationMocks.module.ts delete mode 100644 src/test/javascript/spec/helpers/mocks/directive/ngbTooltipMocks.module.ts diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts index 86f602263226..c516b74cc26e 100644 --- a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts @@ -4,7 +4,6 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { ArtemisTestModule } from '../../../test.module'; import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component'; import { ReactiveFormsModule } from '@angular/forms'; -import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { IrisLogoButtonComponent } from 'app/iris/iris-logo-button/iris-logo-button.component'; @@ -16,7 +15,7 @@ describe('CourseDescriptionFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, ReactiveFormsModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule, ReactiveFormsModule], declarations: [ CourseDescriptionFormComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/shared/result.component.spec.ts b/src/test/javascript/spec/component/shared/result.component.spec.ts index 4bf9b19beb03..e675370adbe0 100644 --- a/src/test/javascript/spec/component/shared/result.component.spec.ts +++ b/src/test/javascript/spec/component/shared/result.component.spec.ts @@ -1,7 +1,7 @@ import { ArtemisTestModule } from '../../test.module'; import { ResultComponent } from 'app/exercises/shared/result/result.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; +import { MissingResultInformation, ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; import { SimpleChange } from '@angular/core'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; @@ -13,14 +13,12 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; import dayjs from 'dayjs/esm'; -import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import * as utils from 'app/exercises/shared/feedback/feedback.utils'; import { FeedbackComponentPreparedParams } from 'app/exercises/shared/feedback/feedback.utils'; import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; import { By } from '@angular/platform-browser'; -import { MissingResultInformation } from 'app/exercises/shared/result/result.utils'; import { faTimesCircle } from '@fortawesome/free-solid-svg-icons'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; import { Router } from '@angular/router'; @@ -87,7 +85,7 @@ describe('ResultComponent', () => { global.URL.revokeObjectURL = jest.fn(); await TestBed.configureTestingModule({ - imports: [ArtemisTestModule, NgbTooltipMocksModule], + imports: [ArtemisTestModule], declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe), MockDirective(TranslateDirective)], providers: [ { provide: NgbModal, useClass: MockNgbModalService }, diff --git a/src/test/javascript/spec/helpers/mocks/directive/ngbAlertsMocks.module.ts b/src/test/javascript/spec/helpers/mocks/directive/ngbAlertsMocks.module.ts deleted file mode 100644 index 32c640bfa9f7..000000000000 --- a/src/test/javascript/spec/helpers/mocks/directive/ngbAlertsMocks.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, EventEmitter, Input, NgModule, Output } from '@angular/core'; - -@Component({ - selector: 'ngb-alert', - exportAs: 'ngbAlert', - template: '', -}) -class NgbAlertMockComponent { - @Input() animation: boolean; - @Input() dismissible: boolean; - @Input() type: string; - @Output() closed = new EventEmitter(); -} - -@NgModule({ - declarations: [NgbAlertMockComponent], - exports: [NgbAlertMockComponent], -}) -export class NgbAlertsMocksModule {} diff --git a/src/test/javascript/spec/helpers/mocks/directive/ngbCollapseMocks.module.ts b/src/test/javascript/spec/helpers/mocks/directive/ngbCollapseMocks.module.ts deleted file mode 100644 index 47cccdd196f9..000000000000 --- a/src/test/javascript/spec/helpers/mocks/directive/ngbCollapseMocks.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Directive, EventEmitter, Input, NgModule, Output } from '@angular/core'; - -@Directive({ - selector: '[ngbCollapse]', -}) -class NgbCollapseMockDirective { - @Input() animation: any; - private _isCollapsed = false; - @Input('ngbCollapse') - set collapsed(isCollapsed: boolean) { - if (this._isCollapsed !== isCollapsed) { - this._isCollapsed = isCollapsed; - } - } - - @Output() ngbCollapseChange = new EventEmitter(); - @Input() horizontal: boolean; - @Output() shown = new EventEmitter(); - @Output() hidden = new EventEmitter(); - toggle() {} -} - -@NgModule({ - imports: [NgbCollapseMockDirective], -}) -export class NgbCollapseMocksModule {} diff --git a/src/test/javascript/spec/helpers/mocks/directive/ngbDropdownMocks.module.ts b/src/test/javascript/spec/helpers/mocks/directive/ngbDropdownMocks.module.ts deleted file mode 100644 index 19249f20543f..000000000000 --- a/src/test/javascript/spec/helpers/mocks/directive/ngbDropdownMocks.module.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Directive, EventEmitter, Input, NgModule, Output } from '@angular/core'; - -@Directive({ - selector: '[ngbDropdownItem]', -}) -class NgbDropdownItemMockDirective { - @Input() disabled: boolean; -} - -@Directive({ - selector: '[ngbDropdownMenu]', -}) -class NgbDropdownMenuMockDirective {} - -@Directive({ - selector: '[ngbDropdownToggle]', -}) -class NgbDropdownToggleMockDirective {} - -@Directive({ - selector: '[ngbDropdown]', - exportAs: 'ngbDropdown', -}) -class NgbDropdownMockDirective { - @Input() autoClose: boolean | 'outside' | 'inside'; - @Input() dropdownClass: string; - @Input() isOpen = false; - @Input() placement: any; - @Input() popperOptions: (options: Partial) => Partial; - @Input() container: null | 'body'; - @Input() display: 'dynamic' | 'static'; - @Output() openChange = new EventEmitter(); - open() { - this.isOpen = true; - this.openChange.emit(this.isOpen); - } - close() { - this.isOpen = false; - this.openChange.emit(this.isOpen); - } -} - -@Directive({ - selector: '[ngbDropdownAnchor]', -}) -class NgbDropdownAnchorMockDirective {} - -@NgModule({ - exports: [NgbDropdownItemMockDirective, NgbDropdownMenuMockDirective, NgbDropdownToggleMockDirective, NgbDropdownMockDirective, NgbDropdownAnchorMockDirective], - imports: [NgbDropdownItemMockDirective, NgbDropdownMenuMockDirective, NgbDropdownToggleMockDirective, NgbDropdownMockDirective, NgbDropdownAnchorMockDirective], -}) -export class NgbDropdownMocksModule {} diff --git a/src/test/javascript/spec/helpers/mocks/directive/ngbPaginationMocks.module.ts b/src/test/javascript/spec/helpers/mocks/directive/ngbPaginationMocks.module.ts deleted file mode 100644 index d4dc5cd47c2a..000000000000 --- a/src/test/javascript/spec/helpers/mocks/directive/ngbPaginationMocks.module.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, Directive, EventEmitter, Input, NgModule, Output } from '@angular/core'; - -@Directive({ selector: 'ng-template[ngbPaginationLast]' }) -export class NgbPaginationLastMockDirective {} - -@Directive({ selector: 'ng-template[ngbPaginationNext]' }) -export class NgbPaginationNextMockDirective {} - -@Directive({ selector: 'ng-template[ngbPaginationNumber]' }) -export class NgbPaginationNumberMockDirective {} - -@Directive({ selector: 'ng-template[ngbPaginationPrevious]' }) -export class NgbPaginationPreviousMockDirective {} - -@Directive({ selector: 'ng-template[ngbPaginationPages]' }) -export class NgbPaginationPagesMockDirective {} - -@Component({ - selector: 'ngb-pagination', - template: '', -}) -export class NgbPaginationMockComponent { - @Input() disabled: boolean; - @Input() boundaryLinks: boolean; - @Input() directionLinks: boolean; - @Input() ellipses: boolean; - @Input() rotate: boolean; - @Input() collectionSize: number; - @Input() maxSize: number; - @Input() page = 1; - @Input() pageSize: number; - @Output() pageChange = new EventEmitter(true); - @Input() size: 'sm' | 'lg' | string | null; -} - -@NgModule({ - imports: [ - NgbPaginationMockComponent, - NgbPaginationPagesMockDirective, - NgbPaginationLastMockDirective, - NgbPaginationNextMockDirective, - NgbPaginationNumberMockDirective, - NgbPaginationPreviousMockDirective, - ], - exports: [ - NgbPaginationMockComponent, - NgbPaginationPagesMockDirective, - NgbPaginationLastMockDirective, - NgbPaginationNextMockDirective, - NgbPaginationNumberMockDirective, - NgbPaginationPreviousMockDirective, - ], -}) -export class NgbPaginationMocksModule {} diff --git a/src/test/javascript/spec/helpers/mocks/directive/ngbTooltipMocks.module.ts b/src/test/javascript/spec/helpers/mocks/directive/ngbTooltipMocks.module.ts deleted file mode 100644 index 53a71c18bc03..000000000000 --- a/src/test/javascript/spec/helpers/mocks/directive/ngbTooltipMocks.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Component, Directive, EventEmitter, Input, NgModule, Output } from '@angular/core'; - -@Component({ - selector: 'ngb-tooltip-window', - template: ``, -}) -export class NgbTooltipWindowMockComponent { - @Input() animation: boolean; - @Input() id: string; - @Input() tooltipClass: string; -} - -@Directive({ - selector: '[ngbTooltip]', - exportAs: 'ngbTooltip', -}) -export class NgbTooltipMockDirective { - @Input() animation: boolean; - @Input() autoClose: boolean | 'inside' | 'outside'; - @Input() placement: any; - @Input() popperOptions: (options: Partial) => Partial; - @Input() triggers: string; - @Input() positionTarget?: string | HTMLElement; - @Input() container: string; - @Input() disableTooltip: boolean; - @Input() tooltipClass: string; - @Input() openDelay: number; - @Input() closeDelay: number; - @Input() ngbTooltip: any; - - @Output() shown = new EventEmitter(); - @Output() hidden = new EventEmitter(); -} - -@NgModule({ - exports: [NgbTooltipMockDirective, NgbTooltipWindowMockComponent], - imports: [NgbTooltipMockDirective, NgbTooltipWindowMockComponent], -}) -export class NgbTooltipMocksModule {} From 52fad8481a73d5b9576d2969b6e4d821b430fd2f Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Thu, 6 Feb 2025 00:35:41 +0100 Subject: [PATCH 4/5] remove unnecessary semicolon --- .../spec/component/course/course-overview.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts index 5cc7bedd416f..1011b93ac713 100644 --- a/src/test/javascript/spec/component/course/course-overview.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.component.spec.ts @@ -163,7 +163,7 @@ describe('CourseOverviewComponent', () => { router = new MockRouter(); TestBed.configureTestingModule({ - imports: [RouterModule.forRoot([]), ArtemisTestModule, MockModule(MatSidenavModule), MockModule(NgbTooltipModule), MockModule(BrowserAnimationsModule), ,], + imports: [RouterModule.forRoot([]), ArtemisTestModule, MockModule(MatSidenavModule), MockModule(NgbTooltipModule), MockModule(BrowserAnimationsModule)], declarations: [ CourseOverviewComponent, MockDirective(MockHasAnyAuthorityDirective), From d44336f8373d4ee04e6f000ab827b57ba38d0955 Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Thu, 6 Feb 2025 09:43:33 +0100 Subject: [PATCH 5/5] remove unnecessary semicolon and fix coverage setting --- jest.config.js | 2 +- .../iris/settings/iris-settings-update-component.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jest.config.js b/jest.config.js index 3d30b4370c50..27fe90667451 100644 --- a/jest.config.js +++ b/jest.config.js @@ -92,7 +92,7 @@ module.exports = { global: { // TODO: in the future, the following values should increase to at least 90% statements: 88.72, - branches: 74.4, + branches: 74.38, functions: 82.87, lines: 88.76, }, diff --git a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts index 131849230900..12a6cd9fd5c9 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-settings-update-component.spec.ts @@ -47,7 +47,7 @@ describe('IrisSettingsUpdateComponent', () => { }; TestBed.configureTestingModule({ - imports: [ArtemisTestModule, , MockJhiTranslateDirective, IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, IrisCommonSubSettingsUpdateComponent], + imports: [ArtemisTestModule, MockJhiTranslateDirective, IrisCourseSettingsUpdateComponent, IrisSettingsUpdateComponent, IrisCommonSubSettingsUpdateComponent], declarations: [MockPipe(ArtemisTranslatePipe), MockComponent(ButtonComponent)], providers: [MockProvider(IrisSettingsService, irisSettingsServiceMock), provideHttpClient(), provideHttpClientTesting()], })