Development: Improve exercise import e2e tests

src/test/playwright/e2e/exercise/ExerciseImport.spec.ts

@@ -44,6 +44,7 @@ test.describe('Import exercises', () => {
             await courseManagementExercises.importTextExercise();
             await courseManagementExercises.clickImportExercise(textExercise.id!);
 
+            await textExerciseCreation.waitForFormToLoad();
             await expect(page.locator('#field_title')).toHaveValue(textExercise.title!);
             await expect(page.locator('#field_points')).toHaveValue(`${textExercise.maxPoints!}`);
 
@@ -74,10 +75,11 @@ test.describe('Import exercises', () => {
             await courseManagementExercises.importQuizExercise();
             await courseManagementExercises.clickImportExercise(quizExercise.id!);
 
+            await quizExerciseCreation.waitForFormToLoad();
             await expect(page.locator('#field_title')).toHaveValue(quizExercise.title!);
             await expect(page.locator('#quiz-duration-minutes')).toHaveValue(`${quizExercise.duration! / 60}`);
 
-            await quizExerciseCreation.setVisibleFrom(dayjs());
+            await quizExerciseCreation.setReleaseDate(dayjs());
 
             const importResponse = await quizExerciseCreation.import();
             const exercise: QuizExercise = await importResponse.json();
@@ -100,7 +102,7 @@ test.describe('Import exercises', () => {
                 await courseManagementExercises.importModelingExercise();
                 await courseManagementExercises.clickImportExercise(modelingExercise.id!);
 
-                await page.waitForTimeout(10000);
+                await modelingExerciseCreation.waitForFormToLoad();
                 await expect(page.locator('#field_title')).toHaveValue(modelingExercise.title!);
                 await expect(page.locator('#field_points')).toHaveValue(`${modelingExercise.maxPoints!}`);
 
@@ -131,6 +133,7 @@ test.describe('Import exercises', () => {
                 await courseManagementExercises.importProgrammingExercise();
                 await courseManagementExercises.clickImportExercise(programmingExercise.id!);
 
+                await programmingExerciseCreation.waitForFormToLoad();
                 await expect(page.locator('#field_points')).toHaveValue(`${programmingExercise.maxPoints!}`);
 
                 await programmingExerciseCreation.setTitle('Import Test');

src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseManagement.spec.ts

@@ -24,7 +24,7 @@ test.describe('File upload exercise management', { tag: '@fast' }, () => {
 
         // Fill out file upload exercise form
         const exerciseTitle = 'file upload exercise' + generateUUID();
-        await fileUploadExerciseCreation.typeTitle(exerciseTitle);
+        await fileUploadExerciseCreation.setTitle(exerciseTitle);
         await fileUploadExerciseCreation.setReleaseDate(dayjs());
         await fileUploadExerciseCreation.setDueDate(dayjs().add(1, 'days'));
         await fileUploadExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days'));

src/test/playwright/support/fixtures.ts

@@ -37,7 +37,7 @@ import { ProgrammingExerciseCreationPage } from './pageobjects/exercises/program
 import { QuizExerciseCreationPage } from './pageobjects/exercises/quiz/QuizExerciseCreationPage';
 import { StudentExamManagementPage } from './pageobjects/exam/StudentExamManagementPage';
 import { TextExerciseCreationPage } from './pageobjects/exercises/text/TextExerciseCreationPage';
-import { CreateModelingExercisePage } from './pageobjects/exercises/modeling/CreateModelingExercisePage';
+import { ModelingExerciseCreationPage } from './pageobjects/exercises/modeling/ModelingExerciseCreationPage';
 import { ExamTestRunPage } from './pageobjects/exam/ExamTestRunPage';
 import { CourseManagementExercisesPage } from './pageobjects/course/CourseManagementExercisesPage';
 import { TextExerciseExampleSubmissionsPage } from './pageobjects/exercises/text/TextExerciseExampleSubmissionsPage';
@@ -115,7 +115,7 @@ export type ArtemisPageObjects = {
     fileUploadExerciseCreation: FileUploadExerciseCreationPage;
     fileUploadExerciseEditor: FileUploadEditorPage;
     fileUploadExerciseFeedback: FileUploadExerciseFeedbackPage;
-    modelingExerciseCreation: CreateModelingExercisePage;
+    modelingExerciseCreation: ModelingExerciseCreationPage;
     modelingExerciseEditor: ModelingEditor;
     modelingExerciseFeedback: ModelingExerciseFeedbackPage;
     programmingExerciseCreation: ProgrammingExerciseCreationPage;
@@ -292,7 +292,7 @@ export const test = base.extend<ArtemisPageObjects & ArtemisCommands & ArtemisRe
         await use(new FileUploadExerciseFeedbackPage(page));
     },
     modelingExerciseCreation: async ({ page }, use) => {
-        await use(new CreateModelingExercisePage(page));
+        await use(new ModelingExerciseCreationPage(page));
     },
     modelingExerciseEditor: async ({ page }, use) => {
         await use(new ModelingEditor(page));

src/test/playwright/support/pageobjects/exercises/AbstractExerciseCreationPage.ts

@@ -0,0 +1,39 @@
+import { Locator, Page } from '@playwright/test';
+import { Dayjs } from 'dayjs';
+import { enterDate } from '../../utils';
+
+export class AbstractExerciseCreationPage {
+    protected readonly page: Page;
+
+    constructor(page: Page) {
+        this.page = page;
+    }
+
+    async setTitle(title: string) {
+        const titleField = this.page.locator('#field_title');
+        await titleField.clear();
+        await titleField.fill(title);
+    }
+
+    async setReleaseDate(date: Dayjs) {
+        await enterDate(this.page, '#pick-releaseDate', date);
+    }
+
+    async setDueDate(date: Dayjs) {
+        await enterDate(this.page, '#pick-dueDate', date);
+    }
+
+    async setAssessmentDueDate(date: Dayjs) {
+        await enterDate(this.page, '#pick-assessmentDueDate', date);
+    }
+
+    async clearText(textEditor: Locator) {
+        await textEditor.click();
+        await textEditor.press('Control+a');
+        await textEditor.press('Delete');
+    }
+
+    async waitForFormToLoad() {
+        await this.page.locator('[name*="editForm"]').waitFor({ state: 'visible', timeout: 10000 });
+    }
+}

src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts

@@ -1,31 +1,7 @@
-import { Page } from 'playwright';
 import { UPLOAD_EXERCISE_BASE } from '../../../constants';
-import { Dayjs } from 'dayjs';
-import { enterDate } from '../../../utils';
-
-export class FileUploadExerciseCreationPage {
-    private readonly page: Page;
-
-    constructor(page: Page) {
-        this.page = page;
-    }
-
-    async typeTitle(title: string) {
-        await this.page.locator('#field_title').fill(title);
-    }
-
-    async setReleaseDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-releaseDate', date);
-    }
-
-    async setDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-dueDate', date);
-    }
-
-    async setAssessmentDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-assessmentDueDate', date);
-    }
+import { AbstractExerciseCreationPage } from '../AbstractExerciseCreationPage';
 
+export class FileUploadExerciseCreationPage extends AbstractExerciseCreationPage {
     async typeMaxPoints(maxPoints: number) {
         await this.page.locator('#field_points').fill(maxPoints.toString());
     }

src/test/playwright/support/pageobjects/exercises/modeling/CreateModelingExercisePage.ts → src/test/playwright/support/pageobjects/exercises/modeling/ModelingExerciseCreationPage.ts

@@ -1,21 +1,7 @@
-import { Page } from '@playwright/test';
 import { MODELING_EXERCISE_BASE } from '../../../constants';
-import { Dayjs } from 'dayjs';
-import { enterDate } from '../../../utils';
-
-export class CreateModelingExercisePage {
-    private readonly page: Page;
-
-    constructor(page: Page) {
-        this.page = page;
-    }
-
-    async setTitle(title: string) {
-        const titleField = this.page.locator('#field_title');
-        await titleField.clear();
-        await titleField.fill(title);
-    }
+import { AbstractExerciseCreationPage } from '../AbstractExerciseCreationPage';
 
+export class ModelingExerciseCreationPage extends AbstractExerciseCreationPage {
     async addCategories(categories: string[]) {
         for (const category of categories) {
             const categoriesField = this.page.locator('#field_categories');
@@ -42,18 +28,6 @@ export class CreateModelingExercisePage {
         return await responsePromise;
     }
 
-    async setReleaseDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-releaseDate', date);
-    }
-
-    async setDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-dueDate', date);
-    }
-
-    async setAssessmentDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-assessmentDueDate', date);
-    }
-
     async includeInOverallScore(selection: string = 'No') {
         await this.page.locator('#modeling-includeInScore-picker').locator('.btn', { hasText: selection }).click({ force: true });
     }

src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts

@@ -1,20 +1,11 @@
-import { Locator, Page, expect } from '@playwright/test';
+import { Locator, expect } from '@playwright/test';
 import { PROGRAMMING_EXERCISE_BASE, ProgrammingLanguage } from '../../../constants';
 import { Dayjs } from 'dayjs';
+import { AbstractExerciseCreationPage } from '../AbstractExerciseCreationPage';
 
 const OWL_DATEPICKER_ARIA_LABEL_DATE_FORMAT = 'MMMM D, YYYY';
 
-export class ProgrammingExerciseCreationPage {
-    private readonly page: Page;
-
-    constructor(page: Page) {
-        this.page = page;
-    }
-
-    async setTitle(title: string) {
-        await this.page.locator('#field_title').fill(title);
-    }
-
+export class ProgrammingExerciseCreationPage extends AbstractExerciseCreationPage {
     async changeEditMode() {
         await this.page.locator('#switch-edit-mode-button').click();
     }

src/test/playwright/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts

@@ -1,25 +1,12 @@
-import { Page, expect } from '@playwright/test';
-import { clearTextField, drag, enterDate } from '../../../utils';
-import { Dayjs } from 'dayjs';
+import { expect } from '@playwright/test';
+import { clearTextField, drag } from '../../../utils';
 import { QUIZ_EXERCISE_BASE } from '../../../constants';
 import { Fixtures } from '../../../../fixtures/fixtures';
+import { AbstractExerciseCreationPage } from '../AbstractExerciseCreationPage';
 
-export class QuizExerciseCreationPage {
-    private readonly page: Page;
+export class QuizExerciseCreationPage extends AbstractExerciseCreationPage {
     private readonly DEFAULT_MULTIPLE_CHOICE_ANSWER_COUNT = 4;
 
-    constructor(page: Page) {
-        this.page = page;
-    }
-
-    async setTitle(title: string) {
-        await this.page.locator('#field_title').fill(title);
-    }
-
-    async setVisibleFrom(date: Dayjs) {
-        await enterDate(this.page, '#pick-releaseDate', date);
-    }
-
     async addMultipleChoiceQuestion(title: string, points = 1) {
         await this.page.locator('#quiz-add-mc-question').click();
         await this.page.locator('#mc-question-title').fill(title);

src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts

@@ -1,37 +1,18 @@
-import { Locator, Page } from '@playwright/test';
-import { Dayjs } from 'dayjs';
-import { enterDate } from '../../../utils';
+import { Locator } from '@playwright/test';
 import { TEXT_EXERCISE_BASE } from '../../../constants';
+import { AbstractExerciseCreationPage } from '../AbstractExerciseCreationPage';
 
-export class TextExerciseCreationPage {
-    private readonly page: Page;
-
+export class TextExerciseCreationPage extends AbstractExerciseCreationPage {
     private readonly PROBLEM_STATEMENT_SELECTOR = '#problemStatement';
     private readonly EXAMPLE_SOLUTION_SELECTOR = '#exampleSolution';
     private readonly ASSESSMENT_INSTRUCTIONS_SELECTOR = '#gradingInstructions';
 
-    constructor(page: Page) {
-        this.page = page;
-    }
-
     async typeTitle(title: string) {
         const titleField = this.page.locator('#field_title');
         await titleField.clear();
         await titleField.fill(title);
     }
 
-    async setReleaseDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-releaseDate', date);
-    }
-
-    async setDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-dueDate', date);
-    }
-
-    async setAssessmentDueDate(date: Dayjs) {
-        await enterDate(this.page, '#pick-assessmentDueDate', date);
-    }
-
     async typeMaxPoints(maxPoints: number) {
         await this.page.locator('#field_points').fill(maxPoints.toString());
     }
@@ -82,12 +63,6 @@ export class TextExerciseCreationPage {
         return this.page.locator(selector).locator('.monaco-editor');
     }
 
-    private async clearText(textEditor: Locator) {
-        await textEditor.click();
-        await textEditor.press('Control+a');
-        await textEditor.press('Delete');
-    }
-
     private async typeText(textEditor: Locator, text: string) {
         await textEditor.click();
         await textEditor.pressSequentially(text);