Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Lab/Lab02/src/testing/run-generated-tests.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createRequire } from "node:module";
import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
import { dirname, join, resolve } from "node:path";
import { dirname, join, relative, resolve } from "node:path";
import { fileURLToPath } from "node:url";

import {
Expand Down Expand Up @@ -393,9 +393,14 @@ export async function runApiTrainTests(
export async function runGuiTrainTests(
options: GuiTestOptions,
): Promise<TrainTestResult> {
const absoluteTestPath = resolve(options.testPath);
const playwrightTestPath = relative(projectRoot, absoluteTestPath).replaceAll(
"\\",
"/",
);
await copyFile(
courseGuiTestSupport,
join(dirname(resolve(options.testPath)), "course-gui-test-support.ts"),
join(dirname(absoluteTestPath), "course-gui-test-support.ts"),
);
const server = await startGuiServer({ htmlPath: options.htmlPath });

Expand All @@ -413,7 +418,7 @@ export async function runGuiTrainTests(
[
playwrightCli,
"test",
resolve(options.testPath),
playwrightTestPath,
"--config",
playwrightConfig,
...(excludedPattern === undefined
Expand All @@ -424,7 +429,7 @@ export async function runGuiTrainTests(
cwd: projectRoot,
env: {
COURSE_GUI_BASE_URL: server.url,
COURSE_TEST_DIR: dirname(resolve(options.testPath)),
COURSE_TEST_DIR: dirname(absoluteTestPath),
COURSE_TEST_REPORT: resolve(options.reportPath),
COURSE_TEST_OUTPUT: resolve(options.browserOutputPath),
},
Expand Down
8 changes: 6 additions & 2 deletions Lab/Lab02/src/validation/run-validation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createRequire } from "node:module";
import { mkdir, readFile, writeFile } from "node:fs/promises";
import { dirname, join, resolve } from "node:path";
import { dirname, join, relative, resolve } from "node:path";
import { fileURLToPath } from "node:url";

import {
Expand All @@ -26,6 +26,10 @@ const playwrightCli = join(
dirname(require.resolve("@playwright/test/package.json")),
"cli.js",
);
const guiValidationSpec = relative(
projectRoot,
join(validationRoot, "gui", "register.validation.spec.ts"),
).replaceAll("\\", "/");

interface CommonValidationOptions {
readonly reportPath: string;
Expand Down Expand Up @@ -271,7 +275,7 @@ export async function runGuiValidation(
[
playwrightCli,
"test",
join(validationRoot, "gui", "register.validation.spec.ts"),
guiValidationSpec,
"--config",
join(validationRoot, "playwright.validation.config.ts"),
],
Expand Down