From 8ace45f55248b19208c0c73bb8c4a89c1adc22bd Mon Sep 17 00:00:00 2001 From: Ajayvir Singh <38434017+AjayvirS@users.noreply.github.com> Date: Tue, 24 Dec 2024 08:24:22 +0100 Subject: [PATCH 01/11] `Plagiarism checks`: Add direct link to case view (#9747) --- ...arism-cases-instructor-view.component.html | 37 +++++++---- ...arism-cases-instructor-view.component.scss | 0 ...giarism-cases-instructor-view.component.ts | 61 +++++++++++-------- .../plagiarism/types/GroupedPlagiarismCase.ts | 5 ++ src/main/webapp/i18n/de/plagiarism.json | 3 +- src/main/webapp/i18n/en/plagiarism.json | 3 +- ...sm-cases-instructor-view.component.spec.ts | 57 ++++++++++++++--- 7 files changed, 118 insertions(+), 48 deletions(-) create mode 100644 src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.scss create mode 100644 src/main/webapp/app/exercises/shared/plagiarism/types/GroupedPlagiarismCase.ts diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html index 6bad6dfcb843..ba73e8f31b4f 100644 --- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html +++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html @@ -10,7 +10,7 @@

- @for (exercise of exercisesWithPlagiarismCases; track exercise; let i = $index) { + @for (exercise of exercisesWithPlagiarismCases; track exercise.id; let exerciseIndex = $index) {
@@ -20,6 +20,14 @@
} {{ exercise.title }} + + + +
@@ -49,20 +57,25 @@
- @for (plagiarismCase of groupedPlagiarismCases[exercise!.id!]; track plagiarismCase) { + @for (plagiarismCase of groupedPlagiarismCases[exercise!.id!]; track plagiarismCase; let plagiarismCaseIndex = $index) {
-
- - {{ plagiarismCase.student.name }} ({{ plagiarismCase.student.login }}) - -
+ @if (plagiarismCase.student) { +
+ + {{ plagiarismCase.student.name }} ({{ plagiarismCase.student.login }}) + +
+ } @if (plagiarismCase.plagiarismSubmissions) { -
+
+ + {{ + 'artemisApp.plagiarism.plagiarismCases.appearsInComparisons' | artemisTranslate: { count: plagiarismCase.plagiarismSubmissions?.length } + }} + +
} + @if (plagiarismCase.post) {
{{ 'artemisApp.plagiarism.plagiarismCases.notifiedAt' | artemisTranslate }} {{ plagiarismCase.post.creationDate | artemisDate }} diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.scss b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.scss new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.ts b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.ts index 760d8e6567fb..efa0d14d147e 100644 --- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.ts +++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.ts @@ -3,22 +3,28 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; -import { Exercise, getIcon } from 'app/entities/exercise.model'; +import { Exercise, getExerciseUrlSegment, getIcon } from 'app/entities/exercise.model'; import { downloadFile } from 'app/shared/util/download.util'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; +import { GroupedPlagiarismCases } from 'app/exercises/shared/plagiarism/types/GroupedPlagiarismCase'; import { AlertService } from 'app/core/util/alert.service'; @Component({ selector: 'jhi-plagiarism-cases-instructor-view', templateUrl: './plagiarism-cases-instructor-view.component.html', + styleUrls: ['./plagiarism-cases-instructor-view.component.scss'], }) export class PlagiarismCasesInstructorViewComponent implements OnInit { courseId: number; examId?: number; plagiarismCases: PlagiarismCase[] = []; - groupedPlagiarismCases: any; // maybe? { [key: number]: PlagiarismCase[] } + groupedPlagiarismCases: GroupedPlagiarismCases; exercisesWithPlagiarismCases: Exercise[] = []; + // method called as html template variable, angular only recognises reference variables in html if they are a property + // of the corresponding component class + getExerciseUrlSegment = getExerciseUrlSegment; + readonly getIcon = getIcon; readonly documentationType: DocumentationType = 'PlagiarismChecks'; @@ -39,31 +45,7 @@ export class PlagiarismCasesInstructorViewComponent implements OnInit { plagiarismCasesForInstructor$.subscribe({ next: (res: HttpResponse) => { this.plagiarismCases = res.body!; - this.groupedPlagiarismCases = this.plagiarismCases.reduce( - ( - acc: { - [exerciseId: number]: PlagiarismCase[]; - }, - plagiarismCase, - ) => { - const caseExerciseId = plagiarismCase.exercise?.id; - if (caseExerciseId === undefined) { - return acc; - } - - // Group initialization - if (!acc[caseExerciseId]) { - acc[caseExerciseId] = []; - this.exercisesWithPlagiarismCases.push(plagiarismCase.exercise!); - } - - // Grouping - acc[caseExerciseId].push(plagiarismCase); - - return acc; - }, - {}, - ); + this.groupedPlagiarismCases = this.getGroupedPlagiarismCasesByExercise(this.plagiarismCases); }, }); } @@ -185,4 +167,29 @@ export class PlagiarismCasesInstructorViewComponent implements OnInit { this.alertService.error('artemisApp.plagiarism.plagiarismCases.export.error'); } } + + /** + * groups plagiarism cases by exercise for view + * @param cases to be grouped by exerises + * @private return object containing grouped cases + */ + private getGroupedPlagiarismCasesByExercise(cases: PlagiarismCase[]): GroupedPlagiarismCases { + return cases.reduce((acc: { [exerciseId: number]: PlagiarismCase[] }, plagiarismCase: PlagiarismCase) => { + const caseExerciseId = plagiarismCase.exercise?.id; + if (caseExerciseId === undefined) { + return acc; + } + + // Group initialization + if (!acc[caseExerciseId]) { + acc[caseExerciseId] = []; + this.exercisesWithPlagiarismCases.push(plagiarismCase.exercise!); + } + + // Grouping + acc[caseExerciseId].push(plagiarismCase); + + return acc; + }, {}); + } } diff --git a/src/main/webapp/app/exercises/shared/plagiarism/types/GroupedPlagiarismCase.ts b/src/main/webapp/app/exercises/shared/plagiarism/types/GroupedPlagiarismCase.ts new file mode 100644 index 000000000000..81fffc35017b --- /dev/null +++ b/src/main/webapp/app/exercises/shared/plagiarism/types/GroupedPlagiarismCase.ts @@ -0,0 +1,5 @@ +import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; + +export interface GroupedPlagiarismCases { + [exerciseId: number]: PlagiarismCase[]; +} diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index becba41634fc..31563c61a5cd 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -114,7 +114,8 @@ "noCourseCases": "Keine Plagiatsfälle in diesem Kurs", "noExamCases": "Keine Plagiatsfälle in dieser Prüfung", "notifyStudent": "Studierende:n benachrichtigen", - "studentNotified": "Studierende:r wurde benachrichtigt." + "studentNotified": "Studierende:r wurde benachrichtigt.", + "viewComparisons": "Vergleiche ansehen" }, "cases": { "pageTitle": "Plagiatsfälle", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index ba73b67b9f37..db57419b919e 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -114,7 +114,8 @@ "noCourseCases": "No plagiarism cases in this course", "noExamCases": "No plagiarism cases in this exam", "notifyStudent": "Notify student", - "studentNotified": "Student has been notified." + "studentNotified": "Student has been notified.", + "viewComparisons": "View comparisons" }, "cases": { "pageTitle": "Plagiarism Cases", diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts index 45749bcbdf3a..ce9c798c79d3 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { PlagiarismCasesInstructorViewComponent } from 'app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component'; -import { ArtemisTestModule } from '../../test.module'; -import { MockTranslateService, TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; -import { ActivatedRoute, ActivatedRouteSnapshot, convertToParamMap } from '@angular/router'; +import { ActivatedRoute, ActivatedRouteSnapshot, Router, RouterModule, convertToParamMap } from '@angular/router'; import { Observable, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; @@ -13,8 +11,18 @@ import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/Plagiar import * as DownloadUtil from 'app/shared/util/download.util'; import dayjs from 'dayjs/esm'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; -import { MockComponent } from 'ng-mocks'; +import { MockComponent, MockModule } from 'ng-mocks'; import { NotificationService } from 'app/shared/notification/notification.service'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { MockRouter } from '../../helpers/mocks/mock-router'; +import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; +import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; +import { ArtemisTestModule } from '../../test.module'; +import { MockTranslateService, TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service'; +import { ArtemisDatePipe } from '../../../../../main/webapp/app/shared/pipes/artemis-date.pipe'; +import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; +import { ProgressBarComponent } from 'app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component'; +import { PlagiarismCaseVerdictComponent } from 'app/course/plagiarism-cases/shared/verdict/plagiarism-case-verdict.component'; import { MockNotificationService } from '../../helpers/mocks/service/mock-notification.service'; jest.mock('app/shared/util/download.util', () => ({ @@ -25,6 +33,7 @@ describe('Plagiarism Cases Instructor View Component', () => { let component: PlagiarismCasesInstructorViewComponent; let fixture: ComponentFixture; let plagiarismCasesService: PlagiarismCasesService; + let router: MockRouter; let route: ActivatedRoute; @@ -33,15 +42,24 @@ describe('Plagiarism Cases Instructor View Component', () => { const exercise1 = { id: 1, title: 'Test Exercise 1', + type: ExerciseType.TEXT, } as TextExercise; const exercise2 = { id: 2, title: 'Test Exercise 2', + type: ExerciseType.TEXT, } as TextExercise; + const studentLoginA = 'studentA'; + const plagiarismSubmission1 = { + id: 1, + studentLogin: studentLoginA, + } as PlagiarismSubmission; + const plagiarismCase1 = { id: 1, exercise: exercise1, + student: { id: 1, login: 'Student 1' }, verdict: PlagiarismVerdict.PLAGIARISM, verdictBy: { @@ -56,6 +74,7 @@ describe('Plagiarism Cases Instructor View Component', () => { }, ], }, + plagiarismSubmissions: [plagiarismSubmission1], } as PlagiarismCase; const plagiarismCase2 = { id: 2, @@ -84,13 +103,21 @@ describe('Plagiarism Cases Instructor View Component', () => { } as PlagiarismCase; beforeEach(() => { + router = new MockRouter(); route = { snapshot: { paramMap: convertToParamMap({ courseId: 1 }) } } as any as ActivatedRoute; TestBed.configureTestingModule({ - imports: [ArtemisTestModule, TranslateTestingModule], - declarations: [PlagiarismCasesInstructorViewComponent, MockComponent(DocumentationButtonComponent)], + imports: [ArtemisTestModule, TranslateTestingModule, ArtemisDatePipe, MockModule(RouterModule)], + declarations: [ + PlagiarismCasesInstructorViewComponent, + MockComponent(DocumentationButtonComponent), + MockRouterLinkDirective, + MockComponent(ProgressBarComponent), + MockComponent(PlagiarismCaseVerdictComponent), + ], providers: [ { provide: ActivatedRoute, useValue: route }, + { provide: Router, useValue: router }, { provide: NotificationService, useClass: MockNotificationService }, { provide: TranslateService, useClass: MockTranslateService }, ], @@ -115,7 +142,10 @@ describe('Plagiarism Cases Instructor View Component', () => { expect(component.examId).toBe(0); expect(component.plagiarismCases).toEqual([plagiarismCase1, plagiarismCase2, plagiarismCase3, plagiarismCase4]); expect(component.exercisesWithPlagiarismCases).toEqual([exercise1, exercise2]); - expect(component.groupedPlagiarismCases).toEqual({ 1: [plagiarismCase1, plagiarismCase2], 2: [plagiarismCase3, plagiarismCase4] }); + expect(component.groupedPlagiarismCases).toEqual({ + 1: [plagiarismCase1, plagiarismCase2], + 2: [plagiarismCase3, plagiarismCase4], + }); })); it('should get plagiarism cases for course when exam id is not set', fakeAsync(() => { @@ -198,4 +228,17 @@ describe('Plagiarism Cases Instructor View Component', () => { expect(downloadSpy).toHaveBeenCalledOnce(); expect(downloadSpy).toHaveBeenCalledWith(new Blob(expectedBlob, { type: 'text/csv' }), 'plagiarism-cases.csv'); }); + + it('should navigate to plagiarism detection page on click', fakeAsync(() => { + const courseId = route.snapshot.paramMap.get('courseId'); + // exercise id = exercise1.id for first element of first group (0-0) + const exerciseId = exercise1.id; + + fixture.detectChanges(); + const plagiarismDetectionLink = fixture.debugElement.nativeElement.querySelector('#plagiarism-detection-link-' + exercise1.id); + expect(plagiarismDetectionLink).toBeTruthy(); + plagiarismDetectionLink.click(); + const routePath = router.navigateByUrl.mock.calls[0][0]; + expect(routePath).toStrictEqual(['/course-management', courseId, exercise1.type + '-exercises', exerciseId, 'plagiarism']); + })); }); From 0f1bf00bdb7dbdafaef4c90a3b753bb4b6dd0f13 Mon Sep 17 00:00:00 2001 From: Paul Rangger <48455539+PaRangger@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:50:33 +0100 Subject: [PATCH 02/11] Communication: Add loading indicator when adding users to channel (#10032) --- .../conversation-add-users-form.component.html | 3 +++ .../conversation-add-users-form.component.ts | 13 ++++++++++--- .../conversation-add-users-dialog.component.html | 1 + .../conversation-add-users-dialog.component.ts | 9 +++++++++ .../conversation-add-users-dialog.component.spec.ts | 4 +++- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html index b22435bd18ab..123cb0dc37ea 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html @@ -63,6 +63,9 @@
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.ts b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.ts index d465889f1cc0..08c13cd628ab 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.ts +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.ts @@ -1,8 +1,9 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnChanges, OnInit, Output, input } from '@angular/core'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { getAsChannelDTO } from 'app/entities/metis/conversation/channel.model'; +import { faSpinner } from '@fortawesome/free-solid-svg-icons'; export interface AddUsersFormData { selectedUsers?: UserPublicInfoDTO[]; @@ -24,8 +25,13 @@ export class ConversationAddUsersFormComponent implements OnInit, OnChanges { @Input() activeConversation: ConversationDTO; + protected readonly isLoading = input(false); + form: FormGroup; + // Icons + protected readonly faSpinner = faSpinner; + getAsChannel = getAsChannelDTO; mode: 'individual' | 'group' = 'individual'; @@ -37,8 +43,9 @@ export class ConversationAddUsersFormComponent implements OnInit, OnChanges { get isSubmitPossible() { return ( - (this.mode === 'individual' && !this.form.invalid) || - (this.mode === 'group' && (this.form.value?.addAllStudents || this.form.value?.addAllTutors || this.form.value?.addAllInstructors)) + !this.isLoading() && + ((this.mode === 'individual' && !this.form.invalid) || + (this.mode === 'group' && (this.form.value?.addAllStudents || this.form.value?.addAllTutors || this.form.value?.addAllInstructors))) ); } diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html index 32f3096ca9f0..7082cf10ef0d 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html @@ -17,6 +17,7 @@

user.login!); + this.isLoading = true; + if (isChannelDTO(this.activeConversation)) { this.channelService .registerUsersToChannel(this.course.id!, this.activeConversation.id!, addAllStudents, addAllTutors, addAllInstructors, userLogins) @@ -77,6 +80,9 @@ export class ConversationAddUsersDialogComponent extends AbstractDialogComponent error: (errorResponse: HttpErrorResponse) => { onError(this.alertService, errorResponse); }, + complete: () => { + this.isLoading = false; + }, }); } else if (isGroupChatDTO(this.activeConversation)) { this.groupChatService @@ -90,6 +96,9 @@ export class ConversationAddUsersDialogComponent extends AbstractDialogComponent error: (errorResponse: HttpErrorResponse) => { onError(this.alertService, errorResponse); }, + complete: () => { + this.isLoading = false; + }, }); } else { throw new Error('Conversation type not supported'); diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts index d1afbe9f83f1..f2886be487e9 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts @@ -9,7 +9,7 @@ import { GroupChatService } from 'app/shared/metis/conversations/group-chat.serv import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { Course } from 'app/entities/course.model'; import { generateExampleChannelDTO, generateExampleGroupChatDTO } from '../../helpers/conversationExampleModels'; -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output, input } from '@angular/core'; import { AddUsersFormData } from 'app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component'; import { initializeDialog } from '../dialog-test-helpers'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -29,6 +29,8 @@ class ConversationAddUsersFormStubComponent { @Input() courseId: number; @Input() maxSelectable?: number = undefined; + protected readonly isLoading = input(false); + @Input() activeConversation: ConversationDTO; } From 97542886a05e131bbbc854bbb60cea1afd838ec0 Mon Sep 17 00:00:00 2001 From: Murad Talibov <56686446+muradium@users.noreply.github.com> Date: Wed, 25 Dec 2024 09:52:33 +0100 Subject: [PATCH 03/11] Development: Make compose for playwright tests more reliable (#10065) --- docker/playwright-E2E-tests-multi-node.yml | 2 ++ docker/playwright-E2E-tests-mysql-localci.yml | 1 - docker/playwright.yml | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docker/playwright-E2E-tests-multi-node.yml b/docker/playwright-E2E-tests-multi-node.yml index 62b424023433..fa255a0234eb 100644 --- a/docker/playwright-E2E-tests-multi-node.yml +++ b/docker/playwright-E2E-tests-multi-node.yml @@ -109,6 +109,8 @@ services: condition: service_healthy environment: PLAYWRIGHT_DB_TYPE: 'MySQL' + networks: + - artemis networks: artemis: diff --git a/docker/playwright-E2E-tests-mysql-localci.yml b/docker/playwright-E2E-tests-mysql-localci.yml index 13d2ba3b00ef..68a5f7693f9c 100644 --- a/docker/playwright-E2E-tests-mysql-localci.yml +++ b/docker/playwright-E2E-tests-mysql-localci.yml @@ -48,7 +48,6 @@ services: environment: PLAYWRIGHT_DB_TYPE: 'MySQL' network_mode: service:artemis-app - networks: !reset [] networks: artemis: diff --git a/docker/playwright.yml b/docker/playwright.yml index a27ba2f9d589..82386b6e7b82 100644 --- a/docker/playwright.yml +++ b/docker/playwright.yml @@ -35,13 +35,6 @@ services: ' volumes: - ..:/app/artemis - networks: - - artemis stdin_open: true tty: true ipc: host - -networks: - artemis: - driver: 'bridge' - name: artemis From 84ff994e3553e7d7df7d5c3796682d4b8ae45e9e Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 25 Dec 2024 10:03:22 +0100 Subject: [PATCH 04/11] Development: Update docs python dependencies --- docs/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 0edd5bbb03b7..86389092ce5e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,9 +1,10 @@ alabaster==1.0.0 docutils==0.21.2 +Jinja2==3.1.5 requests==2.32.3 Sphinx==8.1.3 sphinx-rtd-theme==3.0.2 sphinx-autobuild==2024.10.3 sphinxcontrib-bibtex==2.6.3 -urllib3==2.2.3 +urllib3==2.3.0 zipp==3.21.0 From d8d223986d820d7a240a09eed50211ba711a3496 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 25 Dec 2024 10:15:58 +0100 Subject: [PATCH 05/11] Development: Update node to 22 in workflows --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da1a93e4404a..46631245f3c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ on: # Keep in sync with codeql-analysis.yml and test.yml and analysis-of-endpoint-connections.yml env: CI: true - node: 20 + node: 22 java: 21 RAW_URL: https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 785d5f58fd7b..081cb2ccae03 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ on: # Keep in sync with build.yml and test.yml and analysis-of-endpoint-connections.yml env: CI: true - node: 20 + node: 22 java: 21 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccdd88feed03..9271728f3f7e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ concurrency: # Keep in sync with codeql-analysis.yml and build.yml env: CI: true - node: 20 + node: 22 java: 21 jobs: From 422dd83839e810d3f9700f436a707b2b6dc32f69 Mon Sep 17 00:00:00 2001 From: Ole Vester <73833780+ole-ve@users.noreply.github.com> Date: Fri, 27 Dec 2024 10:46:11 +0100 Subject: [PATCH 06/11] Development: Migrate standard competencies admin import component (#9911) --- src/main/webapp/app/admin/admin.module.ts | 2 +- ...ort-standardized-competencies.component.ts | 20 ++++++++++++------- ...n-import-standardized-competencies.spec.ts | 13 +++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/app/admin/admin.module.ts b/src/main/webapp/app/admin/admin.module.ts index 1d5d5e8314ed..0a236665c96d 100644 --- a/src/main/webapp/app/admin/admin.module.ts +++ b/src/main/webapp/app/admin/admin.module.ts @@ -75,6 +75,7 @@ const ENTITY_STATES = [...adminState]; StandardizedCompetencyDetailComponent, DeleteUsersButtonComponent, ProfilePictureComponent, + AdminImportStandardizedCompetenciesComponent, BuildAgentSummaryComponent, BuildAgentDetailsComponent, ], @@ -102,7 +103,6 @@ const ENTITY_STATES = [...adminState]; StandardizedCompetencyEditComponent, KnowledgeAreaEditComponent, StandardizedCompetencyManagementComponent, - AdminImportStandardizedCompetenciesComponent, ], }) export class ArtemisAdminModule {} diff --git a/src/main/webapp/app/admin/standardized-competencies/import/admin-import-standardized-competencies.component.ts b/src/main/webapp/app/admin/standardized-competencies/import/admin-import-standardized-competencies.component.ts index a61113395a00..bd63f1306106 100644 --- a/src/main/webapp/app/admin/standardized-competencies/import/admin-import-standardized-competencies.component.ts +++ b/src/main/webapp/app/admin/standardized-competencies/import/admin-import-standardized-competencies.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { faBan, faChevronRight, faFileImport, faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { KnowledgeAreaDTO, @@ -18,6 +18,12 @@ import { ActivatedRoute, Router } from '@angular/router'; import { MatTreeNestedDataSource } from '@angular/material/tree'; import { NestedTreeControl } from '@angular/cdk/tree'; import { getIcon } from 'app/entities/competency.model'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { StandardizedCompetencyDetailComponent } from 'app/shared/standardized-competencies/standardized-competency-detail.component'; +import { KnowledgeAreaTreeComponent } from 'app/shared/standardized-competencies/knowledge-area-tree.component'; +import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; interface ImportCount { knowledgeAreas: number; @@ -26,7 +32,9 @@ interface ImportCount { @Component({ selector: 'jhi-admin-import-standardized-competencies', + standalone: true, templateUrl: './admin-import-standardized-competencies.component.html', + imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisMarkdownModule, FontAwesomeModule, StandardizedCompetencyDetailComponent, KnowledgeAreaTreeComponent], }) export class AdminImportStandardizedCompetenciesComponent { protected isLoading = false; @@ -76,12 +84,10 @@ export class AdminImportStandardizedCompetenciesComponent { } \`\`\``; - public constructor( - private alertService: AlertService, - private adminStandardizedCompetencyService: AdminStandardizedCompetencyService, - private activatedRoute: ActivatedRoute, - private router: Router, - ) {} + private alertService = inject(AlertService); + private adminStandardizedCompetencyService = inject(AdminStandardizedCompetencyService); + private activatedRoute = inject(ActivatedRoute); + private router = inject(Router); /** * Verifies the file (only .json, smaller than 20 MB) and then tries to read the importData from it 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 15ce0871d27a..cea5d75e4e6e 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 @@ -1,6 +1,6 @@ import { ArtemisTestModule } from '../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { AdminImportStandardizedCompetenciesComponent } from 'app/admin/standardized-competencies/import/admin-import-standardized-competencies.component'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { KnowledgeAreaTreeStubComponent } from './knowledge-area-tree-stub.component'; @@ -15,6 +15,11 @@ import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { KnowledgeAreasForImportDTO } from 'app/entities/competency/standardized-competency.model'; import { StandardizedCompetencyDetailComponent } from 'app/shared/standardized-competencies/standardized-competency-detail.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { ArtemisSharedModule } from '../../../../../main/webapp/app/shared/shared.module'; +import { ArtemisSharedComponentModule } from '../../../../../main/webapp/app/shared/components/shared-component.module'; +import { KnowledgeAreaTreeComponent } from '../../../../../main/webapp/app/shared/standardized-competencies/knowledge-area-tree.component'; +import { ArtemisMarkdownModule } from '../../../../../main/webapp/app/shared/markdown.module'; describe('AdminImportStandardizedCompetenciesComponent', () => { let componentFixture: ComponentFixture; @@ -29,6 +34,12 @@ describe('AdminImportStandardizedCompetenciesComponent', () => { KnowledgeAreaTreeStubComponent, MockComponent(ButtonComponent), MockComponent(StandardizedCompetencyDetailComponent), + MockModule(ArtemisSharedModule), + MockModule(ArtemisSharedComponentModule), + MockModule(ArtemisMarkdownModule), + MockModule(FontAwesomeModule), + MockComponent(StandardizedCompetencyDetailComponent), + MockComponent(KnowledgeAreaTreeComponent), ], providers: [{ provide: Router, useClass: MockRouter }, MockProvider(AlertService)], }) From 116ed6ac23c8d8a0c61e0c5b3cbddd040a8512e0 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 26 Dec 2024 09:34:15 +0100 Subject: [PATCH 07/11] Development: Update spring security LTI library to 0.3.0 --- build.gradle | 4 +--- gradle.properties | 2 +- libs/spring-security-lti13-0.1.13.jar | Bin 71998 -> 0 bytes .../artemis/lti/config/Lti13LaunchFilter.java | 2 +- .../build_plan/JenkinsBuildPlanService.java | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 libs/spring-security-lti13-0.1.13.jar diff --git a/build.gradle b/build.gradle index 8447fced1b2b..d23bcd582750 100644 --- a/build.gradle +++ b/build.gradle @@ -271,9 +271,7 @@ dependencies { implementation "org.apache.logging.log4j:log4j-to-slf4j:2.24.3" - // Note: spring-security-lti13 does not work with jakarta yet, so we built our own custom version and declare its transitive dependencies below - // implementation "uk.ac.ox.ctl:spring-security-lti13:0.1.11" - implementation files("libs/spring-security-lti13-0.1.13.jar") + implementation "uk.ac.ox.ctl:spring-security-lti13:0.3.0" // https://search.maven.org/artifact/org.eclipse.jgit/org.eclipse.jgit implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}" diff --git a/gradle.properties b/gradle.properties index 28a4b2335dd7..c898a11c061d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ node_version=22.12.0 npm_version=10.9.0 # Dependency versions -jhipster_dependencies_version=8.7.2 +jhipster_dependencies_version=8.8.0 spring_boot_version=3.4.1 spring_framework_version=6.2.1 spring_cloud_version=4.2.0 diff --git a/libs/spring-security-lti13-0.1.13.jar b/libs/spring-security-lti13-0.1.13.jar deleted file mode 100644 index fc86bfd877d740262f95e0bfc33304cd722fecf2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71998 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 BN&x@> diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java index 669e309566ef..6929eee2d537 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java @@ -110,7 +110,7 @@ private OidcAuthenticationToken finishOidcFlow(HttpServletRequest request, HttpS throw new IllegalStateException("No authentication was returned"); } } - catch (OAuth2AuthenticationException | IllegalStateException ex) { + catch (OAuth2AuthenticationException | IllegalStateException | IOException | ServletException ex) { throw new IllegalStateException("Failed to attempt LTI 1.3 login authentication: " + ex.getMessage(), ex); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java index 22e9dd1b0233..1264ba9b643f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java @@ -394,7 +394,7 @@ public ContinuousIntegrationService.BuildStatus getBuildStatusOfPlan(String proj } try { - var uri = UriComponentsBuilder.fromHttpUrl(serverUrl.toString()).pathSegment("job", projectKey, "job", planKey, "lastBuild", "api", "json").build().toUri(); + var uri = UriComponentsBuilder.fromUriString(serverUrl.toString()).pathSegment("job", projectKey, "job", planKey, "lastBuild", "api", "json").build().toUri(); var response = restTemplate.getForObject(uri, JsonNode.class); var isJobBuilding = response.get("building").asBoolean(); return isJobBuilding ? ContinuousIntegrationService.BuildStatus.BUILDING : ContinuousIntegrationService.BuildStatus.INACTIVE; @@ -475,7 +475,7 @@ public void givePlanPermissions(ProgrammingExercise programmingExercise, String */ public void enablePlan(String projectKey, String planKey) { try { - var uri = UriComponentsBuilder.fromHttpUrl(serverUrl.toString()).pathSegment("job", projectKey, "job", planKey, "enable").build(true).toUri(); + var uri = UriComponentsBuilder.fromUriString(serverUrl.toString()).pathSegment("job", projectKey, "job", planKey, "enable").build(true).toUri(); restTemplate.postForEntity(uri, null, String.class); } catch (HttpClientErrorException e) { From 1474f61e8704f700a9f1e6ffe05078bbe6648150 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 26 Dec 2024 11:04:07 +0100 Subject: [PATCH 08/11] Development: Unify docker image definitions --- docker/artemis-migration-check-mysql.yml | 2 +- docker/artemis-migration-check-postgres.yml | 2 +- docker/atlassian/atlassian-setup.sh | 82 ------------------- docker/broker-registry.yml | 6 +- docker/gitlab-gitlabci.yml | 2 +- docker/mailhog.yml | 4 +- docker/monitoring.yml | 10 ++- docker/moodle/moodle.yml | 12 +-- docker/mysql.yml | 2 +- docker/nginx.yml | 2 +- docker/playwright.yml | 4 +- docker/postgres.yml | 2 +- docker/saml-test.yml | 4 +- docs/admin/setup/kubernetes.rst | 8 +- .../deployments/artemis-deployment.yml | 2 +- .../artemis/deployments/kafka-deployment.yml | 2 +- .../deployments/zookeeper-deployment.yml | 4 +- .../artemis/statefulsets/artemis-mysql.yml | 2 +- .../statefulsets/jhipster-registry.yml | 2 +- src/test/resources/config/application.yml | 4 +- 20 files changed, 35 insertions(+), 123 deletions(-) delete mode 100755 docker/atlassian/atlassian-setup.sh diff --git a/docker/artemis-migration-check-mysql.yml b/docker/artemis-migration-check-mysql.yml index 7438524fa2e2..7947a108d6db 100644 --- a/docker/artemis-migration-check-mysql.yml +++ b/docker/artemis-migration-check-mysql.yml @@ -17,7 +17,7 @@ services: file: ./mysql.yml service: mysql migration-check: - image: alpine + image: docker.io/library/alpine:3.21.0 container_name: migration-check command: /bin/sh -c "exit 0" depends_on: diff --git a/docker/artemis-migration-check-postgres.yml b/docker/artemis-migration-check-postgres.yml index 1ac60ab3ef45..b3afd781a0dd 100644 --- a/docker/artemis-migration-check-postgres.yml +++ b/docker/artemis-migration-check-postgres.yml @@ -20,7 +20,7 @@ services: file: ./postgres.yml service: postgres migration-check: - image: alpine + image: docker.io/library/alpine:3.21.0 container_name: migration-check command: /bin/sh -c "exit 0" depends_on: diff --git a/docker/atlassian/atlassian-setup.sh b/docker/atlassian/atlassian-setup.sh deleted file mode 100755 index 5a5c17c42ded..000000000000 --- a/docker/atlassian/atlassian-setup.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# for configuring instance over script -jira_external_port=8081 - -set -e -echo In order to work, you need to provide the Username and Password of an admin account for Jira -echo Jira Admin Account -read -p 'Username: ' jira_uservar -read -sp 'Password: ' jira_passvar - -# create groups - -declare -a group_names=("tutors" "instructors" "students" "editors") - -jira_group_url="http://localhost:$jira_external_port/rest/api/latest/group" - -for group_name in "${group_names[@]}"; do - curl -u "$jira_uservar":"$jira_passvar" \ - -s \ - --header "Content-Type: application/json" \ - --request POST \ - --fail \ - --show-error \ - --data "{ - \"name\": \"$group_name\" - }" \ - $jira_group_url -done - -# create users - -jira_user_url="http://localhost:$jira_external_port/rest/api/latest/user" -jira_group_add_url="http://localhost:$jira_external_port/rest/api/2/group/user?groupname=" - - -create_user_and_add_to_group() { - # User 1-5 are students, 6-10 are tutors, 11-15 are editors and 16-20 are instructors - # For the cypress tests students: 100,102,104,(105),106; tutors: 101; instructors: 103 - group="students" - if ((i > 15)) && ((i < 100 || i == 103)); then - group="instructors" - elif ((i > 10)) && ((i < 100)); then - group="editors" - elif ((i > 5)) && ((i < 100 || i == 101)); then - group="tutors" - fi - - # Create user - curl -u "$jira_uservar":"$jira_passvar" \ - -s \ - --header "Content-Type: application/json" \ - --request POST \ - --fail \ - --show-error \ - --data "{ - \"password\": \"artemis_test_user_$i\", - \"emailAddress\": \"artemis_test_user_$i@artemis.local\", - \"displayName\": \"Artemis Test User $i\", - \"name\": \"artemis_test_user_$i\" - - }" \ - $jira_user_url - - # Add user to group - curl -u "$jira_uservar":"$jira_passvar" \ - -s \ - --header "Content-Type: application/json" \ - --request POST \ - --fail \ - --show-error \ - --data "{ - \"name\": \"artemis_test_user_$i\" - }" \ - "$jira_group_add_url$group" -} - -for i in {1..20}; do - create_user_and_add_to_group "$i" -done -for i in {100..106}; do - create_user_and_add_to_group "$i" -done diff --git a/docker/broker-registry.yml b/docker/broker-registry.yml index c984494be465..b26f0ef1b340 100644 --- a/docker/broker-registry.yml +++ b/docker/broker-registry.yml @@ -2,7 +2,7 @@ services: jhipster-registry: container_name: artemis-jhipster-registry image: docker.io/jhipster/jhipster-registry:v7.4.0 - pull_policy: if_not_present + pull_policy: missing volumes: - ./registry:/central-config # When run with the "dev" Spring profile, the JHipster Registry will @@ -28,8 +28,8 @@ services: activemq-broker: container_name: artemis-activemq-broker - image: docker.io/apache/activemq-artemis:2.33.0-alpine - pull_policy: if_not_present + image: docker.io/apache/activemq-artemis:2.39.0-alpine + pull_policy: missing environment: ARTEMIS_USER: ${BROKER_USER:-guest} ARTEMIS_PASSWORD: ${BROKER_PASSWORD:-guest} diff --git a/docker/gitlab-gitlabci.yml b/docker/gitlab-gitlabci.yml index 7560d188f971..3283384ff4a8 100644 --- a/docker/gitlab-gitlabci.yml +++ b/docker/gitlab-gitlabci.yml @@ -13,7 +13,7 @@ services: nginx['listen_port'] = 80 gitlab-runner: image: docker.io/gitlab/gitlab-runner:latest - pull_policy: if_not_present + pull_policy: missing container_name: artemis-gitlab-runner volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker/mailhog.yml b/docker/mailhog.yml index fb93d5784b4d..2b95dd0e7497 100644 --- a/docker/mailhog.yml +++ b/docker/mailhog.yml @@ -7,8 +7,8 @@ services: mailhog: container_name: artemis-mailhog - image: docker.io/mailhog/mailhog - pull_policy: if_not_present + image: docker.io/mailhog/mailhog:v1.0.1 + pull_policy: missing ports: - "1025:1025" - "8025:8025" diff --git a/docker/monitoring.yml b/docker/monitoring.yml index 75e763abfc16..5e411733f6b5 100644 --- a/docker/monitoring.yml +++ b/docker/monitoring.yml @@ -9,8 +9,9 @@ services: prometheus: container_name: artemis-prometheus - image: docker.io/prom/prometheus:v2.52.0 - pull_policy: if_not_present + # TODO: check if we can upgrade to 3.x + image: docker.io/prom/prometheus:v2.55.1 + pull_policy: missing volumes: - ./monitoring/prometheus/:/etc/prometheus/ # If you want to expose these ports outside your dev PC, @@ -25,8 +26,9 @@ services: network_mode: 'host' # to test locally running service grafana: container_name: artemis-grafana - image: docker.io/grafana/grafana:10.1.10 - pull_policy: if_not_present + # TODO: check if we can upgrade to 11.x + image: docker.io/grafana/grafana:10.4.14 + pull_policy: missing volumes: - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/ environment: diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml index 4fc80e796115..95e58363a9f2 100644 --- a/docker/moodle/moodle.yml +++ b/docker/moodle/moodle.yml @@ -1,15 +1,7 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -# Disclaimer: The service marks and trademarks mentioned herein belong to their respective owners. -# No commercial licensing for these products is provided through this file. -# This docker-compose configuration is derived from Bitnami's publicly shared files, accessible at https://github.com/bitnami/containers/tree/main/bitnami/moodle, and is distributed under an open-source license. -# The Moodle™ LMS included in this docker-compose is developed and overseen by Moodle HQ, an independent project from this adaptation and Bitnami. - version: '2' services: mariadb: - image: docker.io/bitnami/mariadb:10.6 + image: docker.io/bitnami/mariadb:11.6.2 environment: # ALLOW_EMPTY_PASSWORD is recommended only for development. - ALLOW_EMPTY_PASSWORD=yes @@ -23,7 +15,7 @@ services: extra_hosts: - "host.docker.internal:host-gateway" moodle: - image: docker.io/bitnami/moodle:4.2 + image: docker.io/bitnami/moodle:4.5.1 ports: - '8085:8080' - '443:8443' diff --git a/docker/mysql.yml b/docker/mysql.yml index ea476dd16287..4af09f97071f 100644 --- a/docker/mysql.yml +++ b/docker/mysql.yml @@ -6,7 +6,7 @@ services: mysql: container_name: artemis-mysql image: docker.io/library/mysql:9.1.0 - pull_policy: if_not_present + pull_policy: missing volumes: - artemis-mysql-data:/var/lib/mysql # DO NOT use this default file for production systems! diff --git a/docker/nginx.yml b/docker/nginx.yml index 4a5988717061..c83d515a50cc 100644 --- a/docker/nginx.yml +++ b/docker/nginx.yml @@ -7,7 +7,7 @@ services: # nginx setup based on artemis prod ansible repository container_name: artemis-nginx image: docker.io/library/nginx:1.27.3 - pull_policy: if_not_present + pull_policy: missing volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx/timeouts.conf:/etc/nginx/conf.d/timeouts.conf:ro diff --git a/docker/playwright.yml b/docker/playwright.yml index 82386b6e7b82..2e2a03d8d8e9 100644 --- a/docker/playwright.yml +++ b/docker/playwright.yml @@ -4,8 +4,8 @@ services: artemis-playwright: - image: mcr.microsoft.com/playwright:v1.44.0-jammy - pull_policy: if_not_present + image: mcr.microsoft.com/playwright:v1.49.1 + pull_policy: missing environment: CI: 'true' BASE_URL: 'https://artemis-nginx' diff --git a/docker/postgres.yml b/docker/postgres.yml index 27bbf433e40b..7a6625ee8faf 100644 --- a/docker/postgres.yml +++ b/docker/postgres.yml @@ -6,7 +6,7 @@ services: postgres: container_name: artemis-postgres image: docker.io/library/postgres:17.2-alpine - pull_policy: if_not_present + pull_policy: missing user: postgres command: ["postgres", "-c", "max_connections=10000"] volumes: diff --git a/docker/saml-test.yml b/docker/saml-test.yml index a71d69dee02e..b2126eaf1db1 100644 --- a/docker/saml-test.yml +++ b/docker/saml-test.yml @@ -12,8 +12,8 @@ services: saml-test: container_name: artemis-saml-test - image: docker.io/jamedjo/test-saml-idp - pull_policy: if_not_present + image: docker.io/jamedjo/test-saml-idp:1.18 + pull_policy: missing ports: - "9980:8080" # expose the port to make it reachable docker internally even if the external port mapping changes diff --git a/docs/admin/setup/kubernetes.rst b/docs/admin/setup/kubernetes.rst index 5ac81b798c7c..def90cdff6b0 100644 --- a/docs/admin/setup/kubernetes.rst +++ b/docs/admin/setup/kubernetes.rst @@ -15,7 +15,7 @@ This section describes how to set up an environment deployed in Kubernetes. Follow the links to install the tools which will be needed to proceed with the Kubernetes cluster setup. The setup has been tested with the described versions; newer ones might work, too. -* `Docker `__ - v20.10.7 +* `Docker `__ - v27.4.1 Docker is a platform for developing, shipping and running applications. In our case, we will use it to build the images which we will deploy. It is also needed from k3d to create a cluster. The cluster nodes are deployed on Docker containers. @@ -24,17 +24,17 @@ The setup has been tested with the described versions; newer ones might work, to Docker Hub is a service provided by Docker for finding and sharing container images. Account in DockerHub is needed to push the Artemis image which will be used by the Kubernetes deployment. -* `k3d `__ - v4.4.7 +* `k3d `__ - v5.7.5 k3d is a lightweight wrapper to run k3s which is a lightweight Kubernetes distribution in Docker. k3d makes it very easy to create k3s clusters especially for local deployment on Kubernetes. Windows users can use ``choco`` to install it. More details can be found in the link under ``Other Installation Methods`` -* `kubectl `__ - v1.21 +* `kubectl `__ - v1.32 kubectl is the Kubernetes command-line tool, which allows you to run commands against Kubernetes clusters. It can be used to deploy applications, inspect and manage cluster resources, and view logs. -* `helm `__ - v3.6.3 +* `helm `__ - v3.16.4 Helm is the package manager for Kubernetes. We will use it to install cert-manager and Rancher diff --git a/src/main/kubernetes/artemis/deployments/artemis-deployment.yml b/src/main/kubernetes/artemis/deployments/artemis-deployment.yml index 168d56f4fa54..8c4597a339ef 100644 --- a/src/main/kubernetes/artemis/deployments/artemis-deployment.yml +++ b/src/main/kubernetes/artemis/deployments/artemis-deployment.yml @@ -59,7 +59,7 @@ spec: terminationGracePeriodSeconds: 30 initContainers: - name: init-ds - image: busybox:latest + image: docker.io/library/busybox:1.37.0 command: - '/bin/sh' - '-c' diff --git a/src/main/kubernetes/artemis/deployments/kafka-deployment.yml b/src/main/kubernetes/artemis/deployments/kafka-deployment.yml index 5c08d6ba750c..039fc5b82401 100644 --- a/src/main/kubernetes/artemis/deployments/kafka-deployment.yml +++ b/src/main/kubernetes/artemis/deployments/kafka-deployment.yml @@ -27,7 +27,7 @@ spec: - configMapRef: name: kafka optional: false - image: confluentinc/cp-kafka:5.5.3 + image: docker.io/confluentinc/cp-kafka:7.8.0 imagePullPolicy: Always name: kafka resources: {} diff --git a/src/main/kubernetes/artemis/deployments/zookeeper-deployment.yml b/src/main/kubernetes/artemis/deployments/zookeeper-deployment.yml index 4d5db7d64d9f..dd9383f1af4d 100644 --- a/src/main/kubernetes/artemis/deployments/zookeeper-deployment.yml +++ b/src/main/kubernetes/artemis/deployments/zookeeper-deployment.yml @@ -29,7 +29,7 @@ spec: - configMapRef: name: zookeeper optional: false - image: confluentinc/cp-zookeeper:5.5.3 + image: docker.io/confluentinc/cp-zookeeper:7.8.0 imagePullPolicy: Always name: zookeeper ports: @@ -51,4 +51,4 @@ spec: restartPolicy: Always schedulerName: default-scheduler securityContext: {} - terminationGracePeriodSeconds: 30 \ No newline at end of file + terminationGracePeriodSeconds: 30 diff --git a/src/main/kubernetes/artemis/statefulsets/artemis-mysql.yml b/src/main/kubernetes/artemis/statefulsets/artemis-mysql.yml index 38d92869a3c3..172e8641343a 100644 --- a/src/main/kubernetes/artemis/statefulsets/artemis-mysql.yml +++ b/src/main/kubernetes/artemis/statefulsets/artemis-mysql.yml @@ -31,7 +31,7 @@ spec: envFrom: - configMapRef: name: artemis-mysql - image: mysql:9.1.0 + image: docker.io/library/mysql:9.1.0 imagePullPolicy: IfNotPresent name: artemis-mysql ports: diff --git a/src/main/kubernetes/artemis/statefulsets/jhipster-registry.yml b/src/main/kubernetes/artemis/statefulsets/jhipster-registry.yml index bf81fe40df68..e888a6c2f7cf 100644 --- a/src/main/kubernetes/artemis/statefulsets/jhipster-registry.yml +++ b/src/main/kubernetes/artemis/statefulsets/jhipster-registry.yml @@ -34,7 +34,7 @@ spec: terminationGracePeriodSeconds: 10 containers: - name: jhipster-registry - image: jhipster/jhipster-registry:v6.7.1 + image: docker.io/jhipster/jhipster-registry:v7.4.0 ports: - containerPort: 8761 envFrom: diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index 8fce605203fa..f730d6102f9c 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -194,7 +194,7 @@ zonky: type: H2 # Alternatives: H2 / MYSQL / POSTGRES postgres: docker: - image: "postgres:17.2-alpine" + image: docker.io/library/postgres:17.2-alpine tmpfs: enabled: true server: @@ -217,7 +217,7 @@ zonky: max_parallel_maintenance_workers: 4 mysql: docker: - image: "mysql:9.1.0" + image: docker.io/library/mysql:9.1.0 tmpfs: enabled: true From f5c8ef02fc30391f5c9f8d001eaa71ac5f3d1fbe Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 26 Dec 2024 15:43:23 +0100 Subject: [PATCH 09/11] Development: Reorganize build.gradle and improve spotless configuration --- .../Artemis__Server__LocalVC___LocalCI_.xml | 11 +- build.gradle | 310 ++++-------------- gradle.properties | 1 - gradle/liquibase.gradle | 6 +- gradle/spotless.gradle | 93 ++++++ gradle/test.gradle | 125 +++++++ gradle/war.gradle | 4 + .../assessment/dto/GradingCriterionDTO.java | 2 +- .../assessment/dto/GradingInstructionDTO.java | 2 +- .../LearningObjectImportService.java | 1 + .../artemis/buildagent/dto/BuildResult.java | 2 +- .../SingleUserNotificationService.java | 2 +- .../core/exception/HttpStatusException.java | 2 +- .../core/security/jwt/TokenProvider.java | 3 +- .../aet/artemis/core/web/CourseResource.java | 2 +- .../aet/artemis/core/web/UserResource.java | 2 +- .../aet/artemis/exam/web/ExamResource.java | 2 +- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../exercise/service/team/TeamService.java | 2 +- .../service/localvc/LocalVCPostPushHook.java | 7 +- .../dto/TutorialGroupFreePeriodDTO.java | 3 - .../core/user/util/UserTestService.java | 1 - .../AbstractModuleTestArchitectureTest.java | 4 +- 23 files changed, 312 insertions(+), 277 deletions(-) create mode 100644 gradle/spotless.gradle create mode 100644 gradle/test.gradle diff --git a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml index 9135ec4a2fd2..77a7a62f375d 100644 --- a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml +++ b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml @@ -1,13 +1,12 @@ - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index d23bcd582750..f3d9bce02838 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,8 @@ -import com.diffplug.spotless.FormatterFunc -import com.diffplug.spotless.FormatterStep -import org.gradle.api.tasks.testing.logging.TestExceptionFormat -import org.gradle.api.tasks.testing.logging.TestLogEvent - -import static com.diffplug.spotless.Formatter.NO_FILE_SENTINEL +buildscript { + dependencies { + classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" + } +} plugins { id "checkstyle" @@ -33,8 +32,19 @@ java { targetCompatibility = JavaVersion.VERSION_21 } -//this enables us to invoke ./gradlew liquibaseDiffChangelog +wrapper { + gradleVersion = "8.12" +} + +node { + download = true + version = "${node_version}" + npmVersion = "${npm_version}" +} + apply from: "gradle/liquibase.gradle" +apply from: "gradle/test.gradle" +apply from: "gradle/spotless.gradle" if (project.hasProperty("prod")) { apply from: "gradle/profile_prod.gradle" @@ -46,65 +56,12 @@ if (project.hasProperty("war")) { apply from: "gradle/war.gradle" } -apply plugin: "jacoco" - idea { module { excludeDirs += files("node_modules") } } -spotless { - - // allows to execute the code formatting commands ./gradlew spotlessApply and ./gradlew spotlessCheck - java { - target { - fileTree(rootDir) { - include ( - "src/main/java/**/*.java", - "src/test/java/**/*.java", - ) - exclude( - "**/src/test/resources/test-data/repository-export/EncodingISO_8559_1.java", - "**/node_modules/**", - "**/out/**", - "**/repos/**", - "**/repos-download/**", - "**/build/**", - "**/src/main/generated/**", - "**/src/main/resources/templates/**", - "/docker/**", - "checked-out-repos/**", - "supporting_scripts/**" - ) - } - } - importOrderFile "artemis-spotless.importorder" - eclipse("4.33").configFile "artemis-spotless-style.xml" - - removeUnusedImports() - trimTrailingWhitespace() - - // Wildcard imports cannot be resolved by spotless itself. - // This will require the developer themselves to adhere to best practices. - addStep(FormatterStep.createNeverUpToDate("Refuse wildcard imports", new FormatterFunc() { - @Override - String apply(String s) throws Exception { - apply(s, NO_FILE_SENTINEL) - } - - @Override - String apply(String s, File file) throws Exception { - if (s =~ /\nimport .*\*;/) { - throw new IllegalArgumentException("Do not use wildcard imports. spotlessApply cannot resolve this issue.\n" + - "The following file violates this rule: " + file.getName()) - } - return s // Ensure a value is returned after processing - } - })) - } -} - defaultTasks "bootRun" springBoot { @@ -118,103 +75,55 @@ modernizer { exclusions = ["java/util/Optional.get:()Ljava/lang/Object;"] } -// Execute the test cases: ./gradlew test -// Execute only architecture tests: ./gradlew test -DincludeTags="ArchitectureTest" -test { - if (System.getProperty("includeTags")) { - useJUnitPlatform { - includeTags System.getProperty("includeTags") - } - } else { - useJUnitPlatform() - exclude "**/*IT*", "**/*IntTest*" - } - - testLogging { - events "FAILED", "SKIPPED" - } - testLogging.showStandardStreams = true - reports.html.required = false - minHeapSize = "2g" // initial heap size - maxHeapSize = "8g" // maximum heap size -} - -tasks.register("testReport", TestReport) { - destinationDirectory = layout.buildDirectory.file("reports/tests").get().asFile - testResults.from(test) -} - -jacoco { - toolVersion = "0.8.12" -} - -jar { - enabled = false -} - -private excludedClassFilesForReport(classDirectories) { - classDirectories.setFrom(files(classDirectories.files.collect { - fileTree(dir: it, - exclude: [ - "**/de/tum/cit/aet/artemis/**/domain/**/*_*", - "**/de/tum/cit/aet/artemis/core/config/migration/entries/**", - "**/gradle-wrapper.jar/**" - ] - ) - })) -} - -jacocoTestReport { - reports { - xml.required = true - } - // we want to ignore some generated files in the domain folders - afterEvaluate { - excludedClassFilesForReport(classDirectories) - } -} - -jacocoTestCoverageVerification { - violationRules { - rule { - limit { - counter = "INSTRUCTION" - value = "COVEREDRATIO" - // TODO: in the future the following value should become higher than 0.92 - minimum = 0.892 - } - limit { - counter = "CLASS" - value = "MISSEDCOUNT" - // TODO: in the future the following value should become less than 10 - maximum = 65 - } - } - } - // we want to ignore some generated files in the domain folders - afterEvaluate { - excludedClassFilesForReport(classDirectories) - } -} -check.dependsOn jacocoTestCoverageVerification - configurations { providedRuntime } repositories { - mavenLocal() mavenCentral() + mavenLocal() // required for org.gradle:gradle-tooling-api dependency maven { - url "https://repo.gradle.org/gradle/libs-releases" + url = "https://repo.gradle.org/gradle/libs-releases" } // required for org.opensaml:* dependencies maven { - url "https://build.shibboleth.net/maven/releases" + url = "https://build.shibboleth.net/maven/releases" } } +configurations.configureEach { +// exclude group: "org.dom4j", module: "dom4j" + exclude group: "org.xmlpull", module: "pull-parser" + exclude group: "jaxen", module: "jaxen" + exclude group: "xmlpull", module: "xpp3" + exclude group: "xsdlib", module: "xsdlib" + exclude group: "javax.xml.stream", module: "stax-api" +// exclude group: "javax.xml.bind", module: "jaxb-api" + + exclude group: "org.junit.vintage", module: "junit-vintage-engine" + exclude group: "com.vaadin.external.google", module: "android-json" + exclude group: "org.xmlunit", module: "xmlunit-core" + + exclude group: "org.testcontainers", module: "mariadb" + exclude group: "org.testcontainers", module: "mssqlserver" + + exclude group: "jakarta.ws.rs", module: "jsr311-api" + + exclude group: "org.springframework.boot", module: "spring-boot-starter-undertow" + + // these modules include security issues and are not needed + exclude group: "commons-jxpath", module: "commons-jxpath" + exclude group: "com.fasterxml.woodstox", module: "woodstox-core" + + // those are transitive dependencies of JPlag Text --> Stanford NLP + // Note: we exclude them because they are not needed and might have security vulnerabilities + exclude group: "org.apache.lucene", module: "lucene-queryparser" + exclude group: "org.apache.lucene", module: "lucene-core" + exclude group: "org.apache.lucene", module: "lucene-analyzers-common" + exclude group: "com.google.protobuf", module: "protobuf-java" +} + dependencies { // Note: jenkins-client is not well maintained and includes dependencies to libraries with critical security issues (e.g. CVE-2020-10683 for dom4j@1.6.1) @@ -253,13 +162,6 @@ dependencies { implementation "de.jplag:text:${jplag_version}" implementation "de.jplag:typescript:${jplag_version}" - // those are transitive dependencies of JPlag Text --> Stanford NLP - // Note: ideally we would exclude them, but for some reason this does not work - implementation "org.apache.lucene:lucene-queryparser:${lucene_version}" - implementation "org.apache.lucene:lucene-core:${lucene_version}" - implementation "org.apache.lucene:lucene-analyzers-common:${lucene_version}" - implementation "com.google.protobuf:protobuf-java:4.29.2" - // we have to override those values to use the latest version implementation "org.slf4j:jcl-over-slf4j:${slf4j_version}" implementation "org.slf4j:jul-to-slf4j:${slf4j_version}" @@ -276,8 +178,6 @@ dependencies { // https://search.maven.org/artifact/org.eclipse.jgit/org.eclipse.jgit implementation "org.eclipse.jgit:org.eclipse.jgit:${jgit_version}" implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.apache:${jgit_version}" - // Note: jgit.htt.server is not compatible with jakarta yet and neither is there a timeline. Hence, we had to add the source files to our repository. - // Once the compatibility is given, we can switch back to the maven dependency. implementation "org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit_version}" // apache ssh enabled the ssh git operations in LocalVC together with JGit @@ -306,13 +206,13 @@ dependencies { implementation "ch.qos.logback:logback-core:${logback_version}" // required by eureka client implementation "com.thoughtworks.xstream:xstream:1.4.21" - // required by JPlag + // required by JPlag, should NOT be used in other places implementation "xerces:xercesImpl:2.12.2" - // required by JPlag + // required by JPlag, should NOT be used in other places implementation "xalan:xalan:2.7.3" - // required by JPlag + // required by JPlag, should NOT be used in other places implementation "xalan:serializer:2.7.3" - // required by Saml2 + // required by Saml2, should NOT be used in other places implementation "org.apache.santuario:xmlsec:4.0.3" implementation "org.jsoup:jsoup:1.18.3" @@ -379,17 +279,9 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-aop:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-data-jpa:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-security:${spring_boot_version}" - implementation("org.springframework.boot:spring-boot-starter-web:${spring_boot_version}") { - exclude module: "spring-boot-starter-undertow" - } + implementation "org.springframework.boot:spring-boot-starter-web:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}" - // Avoid security issues in Tomcat 10.1.33 - implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcat_version}" - implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcat_version}" - implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcat_version}" - implementation "org.apache.tomcat:tomcat-annotations-api:${tomcat_version}" - implementation "org.springframework.boot:spring-boot-starter-websocket:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}" @@ -398,11 +290,7 @@ dependencies { implementation "org.springframework.ldap:spring-ldap-core:3.2.10" implementation "org.springframework.data:spring-data-ldap:3.4.1" - implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}") { - // NOTE: these modules contain security vulnerabilities and are not needed - exclude module: "commons-jxpath" - exclude module: "woodstox-core" - } + implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${spring_cloud_version}" implementation "org.springframework.cloud:spring-cloud-starter-config:${spring_cloud_version}" implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}" @@ -499,12 +387,8 @@ dependencies { } annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}" - annotationProcessor("org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}") { - exclude group: "jakarta.ws.rs", module: "jsr311-api" - } - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${spring_boot_version}") { - exclude group: "com.vaadin.external.google", module: "android-json" - } + annotationProcessor "org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${spring_boot_version}" // ---- CHECKSTYLE DEPENDENCIES ---- @@ -517,11 +401,7 @@ dependencies { // ---- TEST DEPENDENCIES ---- - testImplementation("org.springframework.boot:spring-boot-starter-test:${spring_boot_version}") { - exclude group: "org.junit.vintage", module: "junit-vintage-engine" - exclude group: "com.vaadin.external.google", module: "android-json" - exclude group: "org.xmlunit", module: "xmlunit-core" - } + testImplementation "org.springframework.boot:spring-boot-starter-test:${spring_boot_version}" testImplementation "org.springframework.security:spring-security-test:${spring_security_version}" testImplementation "org.springframework.boot:spring-boot-test:${spring_boot_version}" testImplementation "org.assertj:assertj-core:3.27.0" @@ -534,14 +414,10 @@ dependencies { testImplementation "org.gradle:gradle-tooling-api:8.12" testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.2" testImplementation "com.opencsv:opencsv:5.9" - testImplementation("io.zonky.test:embedded-database-spring-test:2.6.0") { - exclude group: "org.testcontainers", module: "mariadb" - exclude group: "org.testcontainers", module: "mssqlserver" - } + testImplementation "io.zonky.test:embedded-database-spring-test:2.6.0" + testImplementation "com.tngtech.archunit:archunit:1.3.0" - testImplementation("org.skyscreamer:jsonassert:1.5.3") { - exclude module: "android-json" - } + testImplementation "org.skyscreamer:jsonassert:1.5.3" // NOTE: cannot update due to "Syntax error in SQL statement "WITH ids_to_delete" --> should be resolved when we collapse the changelogs again for Artemis 8.0 // testImplementation "com.h2database:h2:2.3.232" @@ -568,64 +444,10 @@ tasks.withType(JavaCompile).configureEach { options.compilerArgs << "-Xlint:deprecation" } -// Taken from here: https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time -tasks.withType(Test).configureEach { - // a collection to track failedTests - ext.failedTests = [] - - testLogging { - // set options for log level LIFECYCLE - events TestLogEvent.FAILED, - TestLogEvent.PASSED, - TestLogEvent.SKIPPED - exceptionFormat TestExceptionFormat.FULL - showExceptions true - showCauses true - showStackTraces true - - info.events = debug.events - info.exceptionFormat = debug.exceptionFormat - } - - afterTest { descriptor, result -> - if (result.resultType == TestResult.ResultType.FAILURE) { - var failedTest = "${descriptor.className}::${descriptor.name}" - logger.debug("Adding " + failedTest + " to failedTests...") - failedTests << [failedTest] - } - } - - afterSuite { suite, result -> - if (!suite.parent) { // will match the outermost suite - def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)" - def startItem = "| ", endItem = " |" - def repeatLength = startItem.length() + output.length() + endItem.length() - println("\n" + ("-" * repeatLength) + "\n" + startItem + output + endItem + "\n" + ("-" * repeatLength)) - // logs each failed test - if (!failedTests.empty) { - logger.lifecycle("Failed tests:") - failedTests.each { failedTest -> - println("${failedTest}") - } - } - } - } -} - -wrapper { - gradleVersion = "8.12" -} - tasks.register("stage") { dependsOn "bootWar" } -node { - download = true - version = "${node_version}" - npmVersion = "${npm_version}" -} - // Set the npm cache (used in the Dockerfile) tasks.register("npmSetCacheDockerfile", NpmTask) { args = ["set", "cache", "/opt/artemis/.npm"] @@ -633,8 +455,8 @@ tasks.register("npmSetCacheDockerfile", NpmTask) { // Command to execute the JavaDoc checkstyle verification ./gradlew checkstyleMain checkstyle { - toolVersion "${checkstyle_version}" - configFile file("checkstyle.xml") + toolVersion = "${checkstyle_version}" + configFile = file("checkstyle.xml") checkstyleTest.enabled = false maxErrors = 0 } diff --git a/gradle.properties b/gradle.properties index c898a11c061d..0277f98d2a3f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,6 @@ logback_version=1.5.15 java_parser_version=3.26.2 byte_buddy_version=1.15.11 netty_version=4.1.115.Final -tomcat_version=10.1.34 # testing # make sure both versions are compatible diff --git a/gradle/liquibase.gradle b/gradle/liquibase.gradle index 56132d15bd6b..8f698a891937 100644 --- a/gradle/liquibase.gradle +++ b/gradle/liquibase.gradle @@ -34,7 +34,7 @@ tasks.register('initPaths', { }) def liquibaseCommand(command) { - javaexec { + tasks.register("runLiquibaseCommand", JavaExec) { if (isWindows) { classpath tasks.named('pathingLiquibaseJar').get().outputs.files } else { @@ -53,8 +53,8 @@ def liquibaseCommand(command) { "--url=jdbc:mysql://localhost:3306/Artemis700?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC", "--driver=com.mysql.cj.jdbc.Driver", command - ] - } + ] + }.get().exec() } tasks.register('liquibaseDiffChangeLog', { diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle new file mode 100644 index 000000000000..136a30f1c0b0 --- /dev/null +++ b/gradle/spotless.gradle @@ -0,0 +1,93 @@ +spotless { + // allows to execute the code formatting commands ./gradlew spotlessApply and ./gradlew spotlessCheck + java { + target { + fileTree(rootDir) { + include ( + "src/main/java/**/*.java", + "src/test/java/**/*.java", + ) + exclude( + "**/src/test/resources/test-data/repository-export/EncodingISO_8559_1.java", + "**/node_modules/**", + "**/out/**", + "**/repos/**", + "**/repos-download/**", + "**/build/**", + "**/src/main/generated/**", + "**/src/main/resources/templates/**", + "/docker/**", + "checked-out-repos/**", + "supporting_scripts/**" + ) + } + } + importOrderFile "artemis-spotless.importorder" + eclipse("4.34").configFile "artemis-spotless-style.xml" + + removeUnusedImports() + + custom 'Remove commented-out import statements', { + it.replaceAll(/\n\/\/ import .*?;.*/, '') + } + + custom 'Refuse wildcard imports', { code -> + // Wildcard imports can't be resolved by spotless itself. + // This will require the developer themselves to adhere to best practices. + if (code =~ /\nimport .*\*;/) { + throw new IllegalArgumentException("Do not use wildcard imports. 'spotlessApply' cannot resolve this issue.") + } + return code // make sure to avoid a warning and always + } + + custom 'Remove unhelpful javadoc stubs', { + // e.g., remove the following lines: + // "* @param paramName" + // "* @throws ExceptionType" + // "* @return returnType"' + // Multiline to allow anchors on newlines + it.replaceAll(/(?m)^ *\* *@(?:param|throws|return) *\w* *\n/, '') + } + + custom 'Remove any empty Javadocs and block comments', { + // Matches any /** [...] */ or /* [...] */ that contains: + // (a) only whitespace + // (b) trivial information, such as "@param paramName" or @throws ExceptionType + // without any additional information. This information is implicit in the signature. + it.replaceAll(/\/\*+\s*\n(\s*\*\s*\n)*\s*\*+\/\s*\n/, '') + } + + // Enforce style modifier order + custom 'Modifier ordering', { + def modifierRanking = [ + "public" : 1, + "protected" : 2, + "private" : 3, + "abstract" : 4, + "default" : 5, + "static" : 6, + "final" : 7, + "transient" : 8, + "volatile" : 9, + "synchronized": 10, + "native" : 11, + "strictfp" : 12] + // Find any instance of multiple modifiers. Lead with a non-word character to avoid + // accidental matching against for instance, "an alternative default value" + it.replaceAll(/\W(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, { + // Do not replace the leading non-word character. Identify the modifiers + it.replaceAll(/(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, { + // Sort the modifiers according to the ranking above + it.split().sort({ modifierRanking[it] }).join(' ') + ' ' + } + ) + } + ) + } + + trimTrailingWhitespace() + endWithNewline() + } +} + + diff --git a/gradle/test.gradle b/gradle/test.gradle new file mode 100644 index 000000000000..d09c3a9c61c4 --- /dev/null +++ b/gradle/test.gradle @@ -0,0 +1,125 @@ +import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent + +// Taken from here: https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time +tasks.withType(Test).configureEach { + // a collection to track failedTests + ext.failedTests = [] + + testLogging { + // set options for log level LIFECYCLE + events TestLogEvent.FAILED, + TestLogEvent.PASSED, + TestLogEvent.SKIPPED + exceptionFormat = TestExceptionFormat.FULL + showExceptions = true + showCauses = true + showStackTraces = true + + info.events = debug.events + info.exceptionFormat = debug.exceptionFormat + } + + afterTest { descriptor, result -> + if (result.resultType == TestResult.ResultType.FAILURE) { + var failedTest = "${descriptor.className}::${descriptor.name}" + logger.debug("Adding " + failedTest + " to failedTests...") + failedTests << [failedTest] + } + } + + afterSuite { suite, result -> + if (!suite.parent) { // will match the outermost suite + def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)" + def startItem = "| ", endItem = " |" + def repeatLength = startItem.length() + output.length() + endItem.length() + println("\n" + ("-" * repeatLength) + "\n" + startItem + output + endItem + "\n" + ("-" * repeatLength)) + // logs each failed test + if (!failedTests.empty) { + logger.lifecycle("Failed tests:") + failedTests.each { failedTest -> + println("${failedTest}") + } + } + } + } +} + + +// Execute the test cases: ./gradlew test +// Execute only architecture tests: ./gradlew test -DincludeTags="ArchitectureTest" +test { + if (System.getProperty("includeTags")) { + useJUnitPlatform { + includeTags System.getProperty("includeTags") + } + } else { + useJUnitPlatform() + exclude "**/*IT*", "**/*IntTest*" + } + + testLogging { + events "FAILED", "SKIPPED" + } + testLogging.showStandardStreams = true + reports.html.required = false + minHeapSize = "2g" // initial heap size + maxHeapSize = "6g" // maximum heap size +} + +tasks.register("testReport", TestReport) { + destinationDirectory = layout.buildDirectory.file("reports/tests").get().asFile + testResults.from(test) +} + +apply plugin: "jacoco" + +jacoco { + toolVersion = "0.8.12" +} + +private excludedClassFilesForReport(classDirectories) { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, + exclude: [ + "**/de/tum/cit/aet/artemis/**/domain/**/*_*", + "**/de/tum/cit/aet/artemis/core/config/migration/entries/**", + "**/gradle-wrapper.jar/**" + ] + ) + })) +} + +jacocoTestReport { + reports { + xml.required = true + } + // we want to ignore some generated files in the domain folders + afterEvaluate { + excludedClassFilesForReport(classDirectories) + } +} + +jacocoTestCoverageVerification { + violationRules { + rule { + limit { + counter = "INSTRUCTION" + value = "COVEREDRATIO" + // TODO: in the future the following value should become higher than 0.92 + minimum = 0.895 + } + limit { + counter = "CLASS" + value = "MISSEDCOUNT" + // TODO: in the future the following value should become less than 10 + maximum = 56 + } + } + } + // we want to ignore some generated files in the domain folders + afterEvaluate { + excludedClassFilesForReport(classDirectories) + } +} +check.dependsOn jacocoTestCoverageVerification diff --git a/gradle/war.gradle b/gradle/war.gradle index fe9e9cd85aa4..7daba4b40242 100644 --- a/gradle/war.gradle +++ b/gradle/war.gradle @@ -19,3 +19,7 @@ war { enabled = true archiveExtension = "war.original" } + +jar { + enabled = false +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java index ebfc35775657..3a54b15e2d4a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java @@ -16,7 +16,7 @@ public record GradingCriterionDTO(long id, String title, Set authorities = Arrays.stream(authorityClaim.toString().split(",")).map(SimpleGrantedAuthority::new).toList(); User principal = new User(claims.getSubject(), "", authorities); - return new UsernamePasswordAuthenticationToken(principal, token, authorities); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index 2545a6ffb192..3523bcb48608 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -884,7 +884,7 @@ public ResponseEntity> getExerciseSt * zip file. It immediately returns and runs this task asynchronously. When the task is done, the course is marked as archived, which means the zip file can be downloaded. * * @param courseId the id of the course - * @return empty + * @return the ResponseEntity with status 200 (OK) when no exception occurred */ @PutMapping("courses/{courseId}/archive") @EnforceAtLeastInstructor diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java index 7e8adfbd022c..60612c7ec6b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java @@ -119,7 +119,7 @@ public ResponseEntity updateUserNotificationDate() { * Updates the HideNotificationsUntil property that indicates which notifications to show (based on their creation date) * * @param showAllNotifications is true if all notifications should be displayed in the sidebar else depending on the HideNotificationsUntil property - * @return void + * @return the ResponseEntity with status 200 (OK) that the update was successful */ @PutMapping("users/notification-visibility") @EnforceAtLeastStudent diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java index 22941fff85e7..8d0e16e4a5c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java @@ -1206,7 +1206,7 @@ public ResponseEntity> getLockedSubmissionsForExam(@PathVariabl * * @param courseId the id of the course * @param examId the id of the exam to archive - * @return empty + * @return the ResponseEntity with status 200 (OK) if the archiving process has been started successfully */ @PutMapping("courses/{courseId}/exams/{examId}/archive") @EnforceAtLeastInstructor diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 9fa635e491eb..3d03030d1bfb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -751,7 +751,7 @@ public void setNumberOfOpenMoreFeedbackRequests(Long numberOfOpenMoreFeedbackReq /** * Checks whether the exercise is released * - * @return boolean + * @return true if the exercise is released (i.e. now is after the release date or the release date is null), false otherwise */ @JsonIgnore public boolean isReleased() { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index 027ae3ead69c..6f67611ce8dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -304,7 +304,7 @@ else if (student.getVisibleRegistrationNumber() != null) { * Returns an instance of TeamImportStrategy based on the given import strategy type (enum) * * @param importStrategyType Type for which to instantiate a strategy - * @return TeamImportStrategy + * @return an instance of TeamImportStrategy based on the given import strategy type */ private TeamImportStrategy getTeamImportStrategy(TeamImportStrategyType importStrategyType) { return switch (importStrategyType) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java index fb925717a387..024c0fa77546 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java @@ -25,11 +25,8 @@ public LocalVCPostPushHook(LocalVCServletService localVCServletService) { /** * Called by JGit after a push has been received (i.e. after the pushed files were successfully written to disk). * - * @param receivePack - * the process handling the current receive. Hooks may obtain - * details about the destination repository through this handle. - * @param commands - * unmodifiable set of successfully completed commands. + * @param receivePack the process handling the current receive. Hooks may obtain details about the destination repository through this handle. + * @param commands unmodifiable set of successfully completed commands. */ @Override public void onPostReceive(ReceivePack receivePack, Collection commands) { diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java index 25086f7b7154..19ac2761f938 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java @@ -9,9 +9,6 @@ /** * Used because we want to interpret the date in the time zone of the tutorial groups configuration * - * @param startDate - * @param endDate - * @param reason */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TutorialGroupFreePeriodDTO(@NotNull LocalDateTime startDate, @NotNull LocalDateTime endDate, String reason) { diff --git a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java index 3b5e71768282..3f4606f09e63 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java @@ -992,7 +992,6 @@ private LinkedMultiValueMap createParamsForPagingRequest(String * * @param userNumbers the user creation matrix * @return String of the user authority with the most users - * @throws Exception */ private String getMainUserAuthority(Integer[] userNumbers) throws Exception { List userNumbersList = Arrays.asList(userNumbers); diff --git a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java index cc4f8c80357c..a9191dcf0a76 100644 --- a/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/shared/architecture/AbstractModuleTestArchitectureTest.java @@ -8,9 +8,9 @@ public abstract class AbstractModuleTestArchitectureTest extends AbstractArchitectureTest { - abstract protected String getModulePackageName(); + protected abstract String getModulePackageName(); - abstract protected Class getAbstractModuleIntegrationTestClass(); + protected abstract Class getAbstractModuleIntegrationTestClass(); @Test void integrationTestsShouldExtendAbstractModuleIntegrationTest() { From 71dedae5bd2a4f2f1aed03e4941c5f182fde4b10 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 26 Dec 2024 17:10:01 +0100 Subject: [PATCH 10/11] Development: Remove deprecated HttpClientTestingModule in client tests --- eslint.config.js | 3 ++ jest.config.js | 6 +-- rules/custom-rules.js | 5 +++ rules/no-http-client-testing-module.js | 38 +++++++++++++++++++ .../course/course-update.component.spec.ts | 2 + .../iris-settings-update-component.spec.ts | 4 ++ .../quiz-exercise-update.component.spec.ts | 5 ++- .../component/team/team.component.spec.ts | 25 +++++------- .../mocks/service/mock-team.service.ts | 15 -------- src/test/javascript/spec/test.module.ts | 7 +++- 10 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 rules/custom-rules.js create mode 100644 rules/no-http-client-testing-module.js diff --git a/eslint.config.js b/eslint.config.js index 622299e984e1..6029bf30bcd8 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -5,6 +5,7 @@ const jestPlugin = require('eslint-plugin-jest'); const jestExtendedPlugin = require('eslint-plugin-jest-extended'); const typescriptParser = require('@typescript-eslint/parser'); const angularTemplateParser = require('@angular-eslint/template-parser'); +const customRulesPlugin = require('./rules/custom-rules'); module.exports = [ { @@ -43,11 +44,13 @@ module.exports = [ '@typescript-eslint': tsPlugin, '@angular-eslint': angularPlugin, prettier: prettierPlugin, + 'custom-rules': customRulesPlugin, }, rules: { ...prettierPlugin.configs.recommended.rules, ...tsPlugin.configs.recommended.rules, ...angularPlugin.configs.recommended.rules, + 'custom-rules/enforce-no-http-client-testing-module': 'error', '@angular-eslint/directive-selector': [ 'warn', { diff --git a/jest.config.js b/jest.config.js index 6c0c7102c751..a5ce2254e1a5 100644 --- a/jest.config.js +++ b/jest.config.js @@ -105,10 +105,10 @@ module.exports = { coverageThreshold: { global: { // TODO: in the future, the following values should increase to at least 90% - statements: 87.73, + statements: 87.71, branches: 73.85, - functions: 82.31, - lines: 87.78, + functions: 82.28, + lines: 87.77, }, }, coverageReporters: ['clover', 'json', 'lcov', 'text-summary'], diff --git a/rules/custom-rules.js b/rules/custom-rules.js new file mode 100644 index 000000000000..521a031582ab --- /dev/null +++ b/rules/custom-rules.js @@ -0,0 +1,5 @@ +const noHttpClientTestingModuleRule = require("./no-http-client-testing-module"); +const plugin = { + rules: { "enforce-no-http-client-testing-module": noHttpClientTestingModuleRule } +}; +module.exports = plugin; diff --git a/rules/no-http-client-testing-module.js b/rules/no-http-client-testing-module.js new file mode 100644 index 000000000000..2585d6ed81d4 --- /dev/null +++ b/rules/no-http-client-testing-module.js @@ -0,0 +1,38 @@ +/** + * @fileoverview Custom ESLint rule to disallow the use of deprecated HttpClientTestingModule. + */ + +"use strict"; + +module.exports = { + meta: { + type: "problem", // Indicates this rule relates to a possible error + docs: { + description: "Disallow the use of deprecated HttpClientTestingModule", + category: "Best Practices", + recommended: true, // Whether this rule is recommended in ESLint configurations + }, + messages: { + avoidHttpClientTestingModule: "'HttpClientTestingModule' is deprecated. Avoid using it.", + }, + schema: [], // No options for this rule + }, + + create(context) { + return { + ImportDeclaration(node) { + if ( + node.source.value === "@angular/common/http/testing" && + node.specifiers.some( + (specifier) => specifier.imported && specifier.imported.name === "HttpClientTestingModule" + ) + ) { + context.report({ + node, + messageId: "avoidHttpClientTestingModule", + }); + } + }, + }; + }, +}; diff --git a/src/test/javascript/spec/component/course/course-update.component.spec.ts b/src/test/javascript/spec/component/course/course-update.component.spec.ts index 9a8d29a1b1fd..eb9819114476 100644 --- a/src/test/javascript/spec/component/course/course-update.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-update.component.spec.ts @@ -112,6 +112,8 @@ describe('Course Management Update Component', () => { { provide: NgbModal, useClass: MockNgbModalService }, MockProvider(TranslateService), MockProvider(LoadImageService), + provideHttpClient(), + provideHttpClientTesting(), ], declarations: [ CourseUpdateComponent, 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 bfea843b7c8b..e35074c2942d 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 @@ -14,6 +14,8 @@ import { IrisCourseSettingsUpdateComponent } from 'app/iris/settings/iris-course 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 { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; describe('IrisSettingsUpdateComponent', () => { let component: IrisSettingsUpdateComponent; @@ -37,6 +39,8 @@ describe('IrisSettingsUpdateComponent', () => { getUncombinedCourseSettings: () => of(mockSettings()), getUncombinedExerciseSettings: () => of(mockSettings()), }), + provideHttpClient(), + provideHttpClientTesting(), ], }) .compileComponents() diff --git a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts index c271a8deb04e..47d8dabd2185 100644 --- a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts @@ -1,4 +1,5 @@ -import { HttpResponse } from '@angular/common/http'; +import { HttpResponse, provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ChangeDetectorRef, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ActivatedRoute, Router, convertToParamMap } from '@angular/router'; @@ -158,6 +159,8 @@ describe('QuizExerciseUpdateComponent', () => { { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, { provide: Router, useClass: MockRouter }, + provideHttpClient(), + provideHttpClientTesting(), ], }) .overrideTemplate(QuizExerciseUpdateComponent, '') diff --git a/src/test/javascript/spec/component/team/team.component.spec.ts b/src/test/javascript/spec/component/team/team.component.spec.ts index 0acd872ac1c4..2b35c859c567 100644 --- a/src/test/javascript/spec/component/team/team.component.spec.ts +++ b/src/test/javascript/spec/component/team/team.component.spec.ts @@ -1,6 +1,5 @@ -import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { ActivatedRoute, Router, RouterModule } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { NgxDatatableModule } from '@siemens/ngx-datatable'; @@ -19,10 +18,13 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { of, throwError } from 'rxjs'; -import { TeamRequestInterceptorMock, mockExercise, mockTeam, mockTeams } from '../../helpers/mocks/service/mock-team.service'; +import { Exercise } from '../../../../../main/webapp/app/entities/exercise.model'; +import { Team } from '../../../../../main/webapp/app/entities/team.model'; +import { mockExercise, mockTeam, mockTeams } from '../../helpers/mocks/service/mock-team.service'; import { ArtemisTestModule } from '../../test.module'; import { AssessmentWarningComponent } from 'app/assessment/assessment-warning/assessment-warning.component'; import { AlertService } from 'app/core/util/alert.service'; +import { HttpResponse } from '@angular/common/http'; describe('TeamComponent', () => { let comp: TeamComponent; @@ -55,18 +57,6 @@ describe('TeamComponent', () => { TeamService, MockProvider(TranslateService), ExerciseService, - { - provide: HTTP_INTERCEPTORS, - useClass: TeamRequestInterceptorMock, - multi: true, - }, - MockProvider(Router), - { - provide: ActivatedRoute, - useValue: { - params: of({ teamId: mockTeam.id, exerciseId: mockExercise.id }), - }, - }, ], }) .compileComponents() @@ -94,7 +84,8 @@ describe('TeamComponent', () => { }); it('should set team and exercise from services and call find on exerciseService to retreive exercise', () => { - jest.spyOn(exerciseService, 'find'); + jest.spyOn(exerciseService, 'find').mockReturnValue(of(new HttpResponse({ body: mockExercise }))); + jest.spyOn(teamService, 'find').mockReturnValue(of(new HttpResponse({ body: mockTeam }))); comp.ngOnInit(); expect(comp.exercise).toEqual(mockExercise); expect(comp.team).toEqual(mockTeam); @@ -146,6 +137,8 @@ describe('TeamComponent', () => { describe('onTeamDelete', () => { it('should go to teams overview on delete', () => { + jest.spyOn(exerciseService, 'find').mockReturnValue(of(new HttpResponse({ body: mockExercise }))); + jest.spyOn(teamService, 'find').mockReturnValue(of(new HttpResponse({ body: mockTeam }))); comp.ngOnInit(); jest.spyOn(router, 'navigate'); comp.onTeamDelete(); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts index 5f830bdf013d..b6509a12c977 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts @@ -172,18 +172,3 @@ export class MockTeamService implements ITeamService { return of({ body: entity }) as Observable>; } } - -@Injectable() -export class TeamRequestInterceptorMock implements HttpInterceptor { - constructor() {} - - intercept(request: HttpRequest, next: HttpHandler): Observable> { - if (request.url && request.url.indexOf(`${TeamService.resourceUrl(mockExercise.id!)}/${mockTeamFromServer.id}`) > -1) { - return of(new HttpResponse({ status: 200, body: mockTeamFromServer })); - } - if (request.url === `api/exercises/${mockExercise.id}`) { - return of(new HttpResponse({ status: 200, body: mockExercise })); - } - return next.handle(request); - } -} diff --git a/src/test/javascript/spec/test.module.ts b/src/test/javascript/spec/test.module.ts index 5d01f73cb5d2..66a0cfab9693 100644 --- a/src/test/javascript/spec/test.module.ts +++ b/src/test/javascript/spec/test.module.ts @@ -1,7 +1,6 @@ import { DatePipe, registerLocaleData } from '@angular/common'; import { ActivatedRoute, Router } from '@angular/router'; import { ElementRef, NgModule, Renderer2 } from '@angular/core'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NgbActiveModal, NgbDatepickerConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from './helpers/mocks/service/mock-account.service'; @@ -20,9 +19,11 @@ import { MockThemeService } from './helpers/mocks/service/mock-theme.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { MockProfileService } from './helpers/mocks/service/mock-profile.service'; import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; @NgModule({ - imports: [HttpClientTestingModule], + imports: [], providers: [ DatePipe, ParseLinks, @@ -65,6 +66,8 @@ import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testi provide: ProfileService, useClass: MockProfileService, }, + provideHttpClient(), + provideHttpClientTesting(), ], exports: [FontAwesomeTestingModule], }) From d6a1b81c858628f949de62c6983785c286ec1c52 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 26 Dec 2024 18:52:39 +0100 Subject: [PATCH 11/11] Development: Add example of client test with vitest --- package-lock.json | 717 ++++++++++++++++++ package.json | 7 +- .../app/shared/layouts/main/main.component.ts | 12 +- .../javascript/vitest/main.component.spec.ts | 79 ++ src/test/javascript/vitest/vitest-setup.ts | 6 + tsconfig.json | 2 +- vite.config.mts | 37 + 7 files changed, 852 insertions(+), 8 deletions(-) create mode 100644 src/test/javascript/vitest/main.component.spec.ts create mode 100644 src/test/javascript/vitest/vitest-setup.ts create mode 100644 vite.config.mts diff --git a/package-lock.json b/package-lock.json index cee87b1beaf0..df82b26a8c98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,6 +80,7 @@ "zone.js": "0.14.10" }, "devDependencies": { + "@analogjs/vite-plugin-angular": "1.10.3", "@angular-builders/jest": "18.0.0", "@angular-devkit/build-angular": "18.2.12", "@angular-eslint/builder": "18.4.1", @@ -91,6 +92,7 @@ "@angular/compiler-cli": "18.2.13", "@angular/language-service": "18.2.13", "@sentry/types": "8.47.0", + "@testing-library/angular": "17.3.5", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", @@ -129,6 +131,8 @@ "sass": "1.83.0", "ts-jest": "29.2.5", "typescript": "5.5.4", + "vite-tsconfig-paths": "5.1.4", + "vitest": "2.1.8", "weak-napi": "2.0.2" }, "engines": { @@ -148,6 +152,80 @@ "node": ">=6.0.0" } }, + "node_modules/@analogjs/vite-plugin-angular": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/@analogjs/vite-plugin-angular/-/vite-plugin-angular-1.10.3.tgz", + "integrity": "sha512-3EWappJ5K6YopJpq2QRVim8qZgaTQJD0RB4G/DXo+Fg0s27BjDORiaeixqLHIwhUzzZ5FR2d1S7dgIi9zOg4sA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ts-morph": "^21.0.0", + "vfile": "^6.0.3" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/brandonroberts" + }, + "peerDependencies": { + "@angular-devkit/build-angular": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "@angular/build": "^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@angular-devkit/build-angular": { + "optional": true + }, + "@angular/build": { + "optional": true + } + } + }, + "node_modules/@analogjs/vite-plugin-angular/node_modules/@ts-morph/common": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.22.0.tgz", + "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-glob": "^3.3.2", + "minimatch": "^9.0.3", + "mkdirp": "^3.0.1", + "path-browserify": "^1.0.1" + } + }, + "node_modules/@analogjs/vite-plugin-angular/node_modules/code-block-writer": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz", + "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@analogjs/vite-plugin-angular/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@analogjs/vite-plugin-angular/node_modules/ts-morph": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-21.0.1.tgz", + "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ts-morph/common": "~0.22.0", + "code-block-writer": "^12.0.0" + } + }, "node_modules/@angular-builders/common": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-2.0.0.tgz", @@ -6742,6 +6820,93 @@ "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==", "license": "ISC" }, + "node_modules/@testing-library/angular": { + "version": "17.3.5", + "resolved": "https://registry.npmjs.org/@testing-library/angular/-/angular-17.3.5.tgz", + "integrity": "sha512-B79mN7kNDY9/+0Kc6cVGnVptQ03oHVL1at1tMu44wvr7Ksk10g11lZw7BA0c7rHAJQoXgiWrXmvtJxkPA1R2uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.3.1" + }, + "peerDependencies": { + "@angular/common": ">= 17.0.0", + "@angular/core": ">= 17.0.0", + "@angular/platform-browser": ">= 17.0.0", + "@angular/router": ">= 17.0.0", + "@testing-library/dom": "^10.0.0" + } + }, + "node_modules/@testing-library/dom": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz", + "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@testing-library/dom/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "dequal": "^2.0.3" + } + }, + "node_modules/@testing-library/dom/node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@testing-library/dom/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@ts-morph/common": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.23.0.tgz", @@ -6833,6 +6998,14 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -7321,6 +7494,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/unist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/use-sync-external-store": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", @@ -7584,6 +7764,139 @@ "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" } }, + "node_modules/@vitest/expect": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.8.tgz", + "integrity": "sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "2.1.8", + "@vitest/utils": "2.1.8", + "chai": "^5.1.2", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/mocker": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.8.tgz", + "integrity": "sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "2.1.8", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.12" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^5.0.0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } + } + }, + "node_modules/@vitest/mocker/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, + "node_modules/@vitest/pretty-format": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.8.tgz", + "integrity": "sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.8.tgz", + "integrity": "sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "2.1.8", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.8.tgz", + "integrity": "sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "2.1.8", + "magic-string": "^0.30.12", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, + "node_modules/@vitest/spy": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.8.tgz", + "integrity": "sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyspy": "^3.0.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.8.tgz", + "integrity": "sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "2.1.8", + "loupe": "^3.1.2", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, "node_modules/@vscode/codicons": { "version": "0.0.36", "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.36.tgz", @@ -8176,6 +8489,16 @@ "node": ">=8" } }, + "node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", @@ -8780,6 +9103,16 @@ "node": ">= 0.8" } }, + "node_modules/cac": { + "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/cacache": { "version": "18.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", @@ -8901,6 +9234,23 @@ ], "license": "CC-BY-4.0" }, + "node_modules/chai": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.2.tgz", + "integrity": "sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -8935,6 +9285,16 @@ "dev": true, "license": "MIT" }, + "node_modules/check-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + } + }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", @@ -10026,6 +10386,16 @@ } } }, + "node_modules/deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -10137,6 +10507,17 @@ "node": ">= 0.8" } }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -10237,6 +10618,14 @@ "node": ">=6" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -11322,6 +11711,16 @@ "node": ">=4.0" } }, + "node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -11425,6 +11824,16 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/expect-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz", + "integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", @@ -12232,6 +12641,13 @@ "node": ">= 4" } }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true, + "license": "MIT" + }, "node_modules/gopd": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.1.0.tgz", @@ -15095,6 +15511,13 @@ "loose-envify": "cli.js" } }, + "node_modules/loupe": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz", + "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==", + "dev": true, + "license": "MIT" + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -15104,6 +15527,17 @@ "yallist": "^3.0.2" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/magic-string": { "version": "0.30.11", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", @@ -16989,6 +17423,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/pathval": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.16" + } + }, "node_modules/pdf-lib": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz", @@ -18815,6 +19266,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, "node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -19200,6 +19658,13 @@ "node": ">=8" } }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -19210,6 +19675,13 @@ "node": ">= 0.8" } }, + "node_modules/std-env": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz", + "integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==", + "dev": true, + "license": "MIT" + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -19800,12 +20272,26 @@ "dev": true, "license": "MIT" }, + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" + }, "node_modules/tinycolor2": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==", "license": "MIT" }, + "node_modules/tinyexec": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz", + "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==", + "dev": true, + "license": "MIT" + }, "node_modules/tinygradient": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/tinygradient/-/tinygradient-1.1.5.tgz", @@ -19816,6 +20302,36 @@ "tinycolor2": "^1.0.0" } }, + "node_modules/tinypool": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", + "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.0.0 || >=20.0.0" + } + }, + "node_modules/tinyrainbow": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz", + "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tinyspy": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tldts": { "version": "6.1.65", "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.65.tgz", @@ -20077,6 +20593,27 @@ } } }, + "node_modules/tsconfck": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.4.tgz", + "integrity": "sha512-kdqWFGVJqe+KGYvlSO9NIaWn9jT1Ny4oKVzAJsKii5eoE9snzTJzL4+MMVOMn+fikWGFmKEylcXL710V/kIPJQ==", + "dev": true, + "license": "MIT", + "bin": { + "tsconfck": "bin/tsconfck.js" + }, + "engines": { + "node": "^18 || >=20" + }, + "peerDependencies": { + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/tsconfig-paths": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", @@ -20369,6 +20906,20 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -20527,6 +21078,36 @@ "node": ">= 0.8" } }, + "node_modules/vfile": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", + "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/vite": { "version": "5.4.11", "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", @@ -20587,6 +21168,49 @@ } } }, + "node_modules/vite-node": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.8.tgz", + "integrity": "sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cac": "^6.7.14", + "debug": "^4.3.7", + "es-module-lexer": "^1.5.4", + "pathe": "^1.1.2", + "vite": "^5.0.0" + }, + "bin": { + "vite-node": "vite-node.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/vite-tsconfig-paths": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz", + "integrity": "sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", + "globrex": "^0.1.2", + "tsconfck": "^3.0.3" + }, + "peerDependencies": { + "vite": "*" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } + } + }, "node_modules/vite/node_modules/@esbuild/aix-ppc64": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", @@ -21017,6 +21641,82 @@ "@esbuild/win32-x64": "0.21.5" } }, + "node_modules/vitest": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.8.tgz", + "integrity": "sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/expect": "2.1.8", + "@vitest/mocker": "2.1.8", + "@vitest/pretty-format": "^2.1.8", + "@vitest/runner": "2.1.8", + "@vitest/snapshot": "2.1.8", + "@vitest/spy": "2.1.8", + "@vitest/utils": "2.1.8", + "chai": "^5.1.2", + "debug": "^4.3.7", + "expect-type": "^1.1.0", + "magic-string": "^0.30.12", + "pathe": "^1.1.2", + "std-env": "^3.8.0", + "tinybench": "^2.9.0", + "tinyexec": "^0.3.1", + "tinypool": "^1.0.1", + "tinyrainbow": "^1.2.0", + "vite": "^5.0.0", + "vite-node": "2.1.8", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@types/node": "^18.0.0 || >=20.0.0", + "@vitest/browser": "2.1.8", + "@vitest/ui": "2.1.8", + "happy-dom": "*", + "jsdom": "*" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + } + } + }, + "node_modules/vitest/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", @@ -21533,6 +22233,23 @@ "node": ">= 8" } }, + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wildcard": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", diff --git a/package.json b/package.json index cc14577f03c2..7c7e3e405edd 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "yargs-parser": "21.1.1" }, "devDependencies": { + "@analogjs/vite-plugin-angular": "1.10.3", "@angular-builders/jest": "18.0.0", "@angular-devkit/build-angular": "18.2.12", "@angular-eslint/builder": "18.4.1", @@ -125,6 +126,7 @@ "@angular/compiler-cli": "18.2.13", "@angular/language-service": "18.2.13", "@sentry/types": "8.47.0", + "@testing-library/angular": "17.3.5", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", @@ -156,13 +158,15 @@ "jest-junit": "16.0.0", "jest-preset-angular": "14.4.2", "lint-staged": "15.2.11", - "ngxtension": "4.2.0", "ng-mocks": "14.13.1", + "ngxtension": "4.2.0", "prettier": "3.4.2", "rimraf": "6.0.1", "sass": "1.83.0", "ts-jest": "29.2.5", "typescript": "5.5.4", + "vite-tsconfig-paths": "5.1.4", + "vitest": "2.1.8", "weak-napi": "2.0.2" }, "engines": { @@ -187,6 +191,7 @@ "test:leaks": "npm run prebuild && ng test --log-heap-usage --detect-leaks", "test:open-handles": "npm run prebuild && ng test --detect-open-handles", "test": "npm run prebuild && ng test --coverage --log-heap-usage -w=4", + "vitest": "npm run prebuild && npx vitest --run", "testw8": "npm run prebuild && ng test --coverage --log-heap-usage -w=8", "update": "ncu -i --format group", "webapp:build": "npm run clean-www && npm run prebuild -- --develop && ng build --configuration development", diff --git a/src/main/webapp/app/shared/layouts/main/main.component.ts b/src/main/webapp/app/shared/layouts/main/main.component.ts index 6563c998cdfa..299eebd09926 100644 --- a/src/main/webapp/app/shared/layouts/main/main.component.ts +++ b/src/main/webapp/app/shared/layouts/main/main.component.ts @@ -27,12 +27,12 @@ export class JhiMainComponent implements OnInit, OnDestroy { courseOverviewSubscription: Subscription; testRunSubscription: Subscription; ltiSubscription: Subscription; - isProduction: boolean = true; - isTestServer: boolean = false; - isExamStarted: boolean = false; - isTestRunExam: boolean = false; - isCourseOverview: boolean = false; - isShownViaLti: boolean = false; + isProduction = true; + isTestServer = false; + isExamStarted = false; + isTestRunExam = false; + isCourseOverview = false; + isShownViaLti = false; constructor( private jhiLanguageHelper: JhiLanguageHelper, diff --git a/src/test/javascript/vitest/main.component.spec.ts b/src/test/javascript/vitest/main.component.spec.ts new file mode 100644 index 000000000000..ead43e7ec9fe --- /dev/null +++ b/src/test/javascript/vitest/main.component.spec.ts @@ -0,0 +1,79 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; +import { render } from '@testing-library/angular'; +import { JhiMainComponent } from 'app/shared/layouts/main/main.component'; +import { AlertOverlayComponent } from 'app/shared/alert/alert-overlay.component'; +import { PageRibbonComponent } from 'app/shared/layouts/profiles/page-ribbon.component'; +import { NotificationPopupComponent } from 'app/shared/notification/notification-popup/notification-popup.component'; +import { TranslateService } from '@ngx-translate/core'; +import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; +import { ThemeService } from 'app/core/theme/theme.service'; +import { ArtemisTranslatePipe } from '../../../main/webapp/app/shared/pipes/artemis-translate.pipe'; +import { MockSyncStorage } from '../spec/helpers/mocks/service/mock-sync-storage.service'; +import { MockTranslateService } from '../spec/helpers/mocks/service/mock-translate.service'; +import { ArtemisTestModule } from '../spec/test.module'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +// Mock the initialize method +class MockThemeService { + // Required because the real ThemeService uses this method, even though it's not called in the tests + initialize(): void {} +} + +describe('JhiMainComponent', () => { + let component: JhiMainComponent; + let componentFixture: ComponentFixture; + let container: Element; + + beforeEach(async () => { + const { fixture, container: renderedContainer } = await render(JhiMainComponent, { + imports: [ArtemisTestModule], + declarations: [AlertOverlayComponent, PageRibbonComponent, NotificationPopupComponent], + providers: [ + { provide: LocalStorageService, useClass: MockSyncStorage }, + { provide: SessionStorageService, useClass: MockSyncStorage }, + { provide: TranslateService, useClass: MockTranslateService }, + { provide: ThemeService, useClass: MockThemeService }, + ArtemisTranslatePipe, + ], + }); + + componentFixture = fixture; + component = fixture.componentInstance; + container = renderedContainer; // Save the container for querying elements + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + it('should use the initialize method of ThemeService', () => { + const themeService = TestBed.inject(ThemeService) as MockThemeService; + themeService.initialize(); + }); + + it('should display footer if there is no exam', async () => { + component.isExamStarted = false; + component.showSkeleton = true; + + const footerElement = container.querySelector('jhi-footer'); + const notificationPopup = container.querySelector('jhi-notification-popup'); + + expect(footerElement).not.toBeNull(); + expect(notificationPopup).not.toBeNull(); + }); + + it('should not display footer during an exam', async () => { + component.isExamStarted = true; + component.showSkeleton = true; + component.isTestRunExam = false; + component.isShownViaLti = false; + + componentFixture.detectChanges(); // Trigger change detection + + const notificationPopup = container.querySelector('jhi-notification-popup'); + const footerElement = container.querySelector('jhi-footer'); + + expect(notificationPopup).not.toBeNull(); + expect(footerElement).toBeNull(); + }); +}); diff --git a/src/test/javascript/vitest/vitest-setup.ts b/src/test/javascript/vitest/vitest-setup.ts new file mode 100644 index 000000000000..7010c5a45b12 --- /dev/null +++ b/src/test/javascript/vitest/vitest-setup.ts @@ -0,0 +1,6 @@ +import '@analogjs/vite-plugin-angular/setup-vitest'; + +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { getTestBed } from '@angular/core/testing'; + +getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); diff --git a/tsconfig.json b/tsconfig.json index 8ce7380a6beb..d6cc333517c6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -43,5 +43,5 @@ } }, "include": ["src/main/webapp/app"], - "exclude": ["node_modules"] + "exclude": ["node_modules", "src/main/resources"] } diff --git a/vite.config.mts b/vite.config.mts new file mode 100644 index 000000000000..40d740042449 --- /dev/null +++ b/vite.config.mts @@ -0,0 +1,37 @@ +/// + +import angular from '@analogjs/vite-plugin-angular'; +import { defineConfig } from 'vite'; +import tsconfigPaths from 'vite-tsconfig-paths'; + +// https://vitejs.dev/config/ +export default defineConfig(({ mode }) => { + return { + plugins: [angular(), tsconfigPaths()], + test: { + globals: true, + environment: 'jsdom', + setupFiles: ['src/test/javascript/vitest/vitest-setup.ts'], + include: ['src/test/javascript/vitest/**/*.spec.ts'], + exclude: [ + 'src/main/resources/**', + 'build/resources/**', // Exclude problematic directories + ], + reporters: ['default'] + }, + resolve: { + alias: { + // Manually resolve the "app/*" alias if needed + app: '/src/main/webapp/app', + }, + }, + build: { + rollupOptions: { + external: [/build\/resources\/.*/, /src\/main\/resources\/.*/], + }, + }, + define: { + 'import.meta.vitest': mode !== 'production', + }, + }; +});