@dxos/test-utils 0.8.3-staging.0fa589b → 0.8.4-main.3f58842
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/playwright.mjs +53 -14
- package/dist/lib/browser/playwright.mjs.map +3 -3
- package/dist/lib/node-esm/index.mjs +1 -1
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/playwright.mjs +53 -14
- package/dist/lib/node-esm/playwright.mjs.map +3 -3
- package/dist/types/src/playwright.d.ts +2 -2
- package/dist/types/src/playwright.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -13
- package/src/playwright.ts +63 -8
- package/dist/lib/node/index.cjs +0 -35
- package/dist/lib/node/index.cjs.map +0 -7
- package/dist/lib/node/meta.json +0 -1
- package/dist/lib/node/playwright.cjs +0 -130
- package/dist/lib/node/playwright.cjs.map +0 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"
|
|
1
|
+
{"inputs":{"src/resource.ts":{"bytes":1532,"imports":[{"path":"vitest","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":453,"imports":[{"path":"src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"},"src/lock.ts":{"bytes":2018,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true}],"format":"esm"},"src/playwright.ts":{"bytes":13691,"imports":[{"path":"@dxos/node-std/fs","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"src/lock.ts","kind":"import-statement","original":"./lock"}],"format":"esm"}},"outputs":{"dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":798},"dist/lib/browser/index.mjs":{"imports":[{"path":"vitest","kind":"import-statement","external":true}],"exports":["openAndClose"],"entryPoint":"src/index.ts","inputs":{"src/resource.ts":{"bytesInOutput":214},"src/index.ts":{"bytesInOutput":0}},"bytes":295},"dist/lib/browser/playwright.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":8058},"dist/lib/browser/playwright.mjs":{"imports":[{"path":"@dxos/node-std/fs","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true}],"exports":["e2ePreset","setupPage","storybookUrl"],"entryPoint":"src/playwright.ts","inputs":{"src/playwright.ts":{"bytesInOutput":3164},"src/lock.ts":{"bytesInOutput":418}},"bytes":3734}}}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
//
|
|
2
|
-
import {
|
|
3
|
-
import { join,
|
|
1
|
+
// src/playwright.ts
|
|
2
|
+
import { existsSync, readFileSync } from "@dxos/node-std/fs";
|
|
3
|
+
import { dirname, join, resolve } from "@dxos/node-std/path";
|
|
4
4
|
import pkgUp from "pkg-up";
|
|
5
5
|
|
|
6
|
-
//
|
|
6
|
+
// src/lock.ts
|
|
7
7
|
import { trigger } from "@dxos/async";
|
|
8
8
|
var Lock = class {
|
|
9
9
|
constructor() {
|
|
@@ -11,35 +11,74 @@ var Lock = class {
|
|
|
11
11
|
}
|
|
12
12
|
async executeSynchronized(fun) {
|
|
13
13
|
const prevPromise = this._lastPromise;
|
|
14
|
-
const [getPromise,
|
|
14
|
+
const [getPromise, resolve2] = trigger();
|
|
15
15
|
this._lastPromise = getPromise();
|
|
16
16
|
await prevPromise;
|
|
17
17
|
try {
|
|
18
18
|
const value = await fun();
|
|
19
19
|
return value;
|
|
20
20
|
} finally {
|
|
21
|
-
|
|
21
|
+
resolve2();
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
25
|
|
|
26
|
-
//
|
|
27
|
-
var
|
|
26
|
+
// src/playwright.ts
|
|
27
|
+
var findWorkspaceRoot = (startDir) => {
|
|
28
|
+
let dir = resolve(startDir);
|
|
29
|
+
while (dir !== "/") {
|
|
30
|
+
try {
|
|
31
|
+
const workspaceYamlPath = join(dir, "pnpm-workspace.yaml");
|
|
32
|
+
if (existsSync(workspaceYamlPath)) {
|
|
33
|
+
return dir;
|
|
34
|
+
}
|
|
35
|
+
const pkgPath = join(dir, "package.json");
|
|
36
|
+
const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
|
|
37
|
+
if (pkg.workspaces) {
|
|
38
|
+
return dir;
|
|
39
|
+
}
|
|
40
|
+
} catch {
|
|
41
|
+
}
|
|
42
|
+
const parent = dirname(dir);
|
|
43
|
+
if (parent === dir) {
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
dir = parent;
|
|
47
|
+
}
|
|
48
|
+
throw new Error("Could not find pnpm workspace root");
|
|
49
|
+
};
|
|
50
|
+
var e2ePreset = (testDir) => {
|
|
28
51
|
const packageJson = pkgUp.sync({
|
|
29
|
-
cwd
|
|
52
|
+
cwd: testDir
|
|
30
53
|
});
|
|
31
54
|
const packageDir = packageJson.split("/").slice(0, -1).join("/");
|
|
32
|
-
const
|
|
33
|
-
|
|
55
|
+
const packageDirName = packageDir.split("/").pop();
|
|
56
|
+
if (!packageDirName) {
|
|
57
|
+
throw new Error("packageDirName not found");
|
|
58
|
+
}
|
|
59
|
+
const workspaceRoot = findWorkspaceRoot(packageDir);
|
|
60
|
+
const testResultOuputDir = join(workspaceRoot, "test-results/playwright/output", packageDirName);
|
|
61
|
+
const reporterOutputFile = join(workspaceRoot, "test-results/playwright/report", `${packageDirName}.json`);
|
|
34
62
|
return {
|
|
63
|
+
testDir,
|
|
64
|
+
outputDir: testResultOuputDir,
|
|
65
|
+
// Run tests in files in parallel.
|
|
66
|
+
fullyParallel: true,
|
|
67
|
+
// Fail the build on CI if you accidentally left test.only in the source code.
|
|
68
|
+
forbidOnly: !!process.env.CI,
|
|
69
|
+
// Retry on CI only.
|
|
70
|
+
retries: process.env.CI ? 2 : 0,
|
|
71
|
+
// Opt out of parallel tests on CI.
|
|
72
|
+
workers: process.env.CI ? 1 : void 0,
|
|
73
|
+
// Reporter to use. See https://playwright.dev/docs/test-reporters.
|
|
35
74
|
reporter: process.env.CI ? [
|
|
36
75
|
[
|
|
37
76
|
"list"
|
|
38
77
|
],
|
|
39
78
|
[
|
|
40
|
-
"
|
|
79
|
+
"json",
|
|
41
80
|
{
|
|
42
|
-
outputFile:
|
|
81
|
+
outputFile: reporterOutputFile
|
|
43
82
|
}
|
|
44
83
|
]
|
|
45
84
|
] : [
|
|
@@ -90,7 +129,7 @@ var setupPage = async (browser, options = {}) => {
|
|
|
90
129
|
page
|
|
91
130
|
};
|
|
92
131
|
};
|
|
93
|
-
var storybookUrl = (storyId) => `http://localhost
|
|
132
|
+
var storybookUrl = (storyId, port = 9009) => `http://localhost:${port}/iframe.html?id=${storyId}&viewMode=story`;
|
|
94
133
|
export {
|
|
95
134
|
e2ePreset,
|
|
96
135
|
setupPage,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/playwright.ts", "../../../src/lock.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport {
|
|
5
|
-
"mappings": ";
|
|
6
|
-
"names": ["
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport { type Browser, type BrowserContext, type PlaywrightTestConfig, type Page } from '@playwright/test';\nimport { existsSync, readFileSync } from 'node:fs';\nimport { dirname, join, resolve } from 'node:path';\nimport pkgUp from 'pkg-up';\n\nimport { Lock } from './lock';\n\nconst findWorkspaceRoot = (startDir: string): string => {\n let dir = resolve(startDir);\n while (dir !== '/') {\n try {\n // Check for pnpm-workspace.yaml first (modern pnpm approach)\n const workspaceYamlPath = join(dir, 'pnpm-workspace.yaml');\n if (existsSync(workspaceYamlPath)) {\n return dir;\n }\n\n // Check for package.json with workspaces field (legacy approach)\n const pkgPath = join(dir, 'package.json');\n const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));\n if (pkg.workspaces) {\n return dir;\n }\n } catch {}\n const parent = dirname(dir);\n if (parent === dir) {\n break;\n }\n dir = parent;\n }\n\n throw new Error('Could not find pnpm workspace root');\n};\n\nexport const e2ePreset = (testDir: string): PlaywrightTestConfig => {\n const packageJson = pkgUp.sync({ cwd: testDir });\n const packageDir = packageJson!.split('/').slice(0, -1).join('/');\n const packageDirName = packageDir.split('/').pop();\n if (!packageDirName) {\n throw new Error('packageDirName not found');\n }\n\n const workspaceRoot = findWorkspaceRoot(packageDir);\n const testResultOuputDir = join(workspaceRoot, 'test-results/playwright/output', packageDirName);\n const reporterOutputFile = join(workspaceRoot, 'test-results/playwright/report', `${packageDirName}.json`);\n\n return {\n testDir,\n outputDir: testResultOuputDir,\n // Run tests in files in parallel.\n fullyParallel: true,\n // Fail the build on CI if you accidentally left test.only in the source code.\n forbidOnly: !!process.env.CI,\n // Retry on CI only.\n retries: process.env.CI ? 2 : 0,\n // Opt out of parallel tests on CI.\n workers: process.env.CI ? 1 : undefined,\n // Reporter to use. See https://playwright.dev/docs/test-reporters.\n reporter: process.env.CI\n ? [\n ['list'],\n [\n 'json',\n {\n outputFile: reporterOutputFile,\n },\n ],\n ]\n : [['list']],\n use: {\n trace: 'retain-on-failure',\n },\n };\n};\n\nexport type SetupOptions = {\n url?: string;\n bridgeLogs?: boolean;\n viewportSize?: Parameters<Page['setViewportSize']>[0];\n};\n\nexport const setupPage = async (browser: Browser | BrowserContext, options: SetupOptions = {}) => {\n const { url, bridgeLogs, viewportSize } = options;\n\n const context = 'newContext' in browser ? await browser.newContext() : browser;\n const page = await context.newPage();\n\n if (viewportSize) {\n await page.setViewportSize(viewportSize);\n }\n\n // TODO(wittjosiah): Remove?\n if (bridgeLogs) {\n const lock = new Lock();\n\n page.on('pageerror', async (error) => {\n await lock.executeSynchronized(async () => {\n // eslint-disable-next-line no-console\n console.log(error);\n });\n });\n\n page.on('console', async (msg) => {\n try {\n const argsPromise = Promise.all(msg.args().map((x) => x.jsonValue()));\n await lock.executeSynchronized(async () => {\n const args = await argsPromise;\n\n if (args.length > 0) {\n console.log(...args);\n } else {\n console.log(msg);\n }\n });\n } catch (err) {\n console.error('Failed to parse message', err);\n }\n });\n }\n\n if (url) {\n await page.goto(url);\n }\n\n return { context, page };\n};\n\nexport const storybookUrl = (storyId: string, port = 9009) =>\n `http://localhost:${port}/iframe.html?id=${storyId}&viewMode=story`;\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { trigger } from '@dxos/async';\n\n// Copied from @dxos/async.\nexport class Lock {\n private _lastPromise = Promise.resolve();\n\n async executeSynchronized<T>(fun: () => Promise<T>): Promise<T> {\n const prevPromise = this._lastPromise;\n const [getPromise, resolve] = trigger();\n this._lastPromise = getPromise();\n\n await prevPromise;\n try {\n const value = await fun();\n return value;\n } finally {\n resolve();\n }\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "trigger", "value", "findWorkspaceRoot", "startDir", "dir", "resolve", "workspaceYamlPath", "join", "existsSync", "pkgPath", "pkg", "JSON", "parse", "readFileSync", "workspaces", "parent", "dirname", "Error", "e2ePreset", "testDir", "packageJson", "pkgUp", "sync", "cwd", "packageDir", "split", "slice", "packageDirName", "pop", "workspaceRoot", "testResultOuputDir", "reporterOutputFile", "outputDir", "fullyParallel", "forbidOnly", "process", "env", "CI", "retries", "workers", "undefined", "reporter", "outputFile", "use", "trace", "setupPage", "browser", "options", "url", "bridgeLogs", "viewportSize", "context", "newContext", "page", "newPage", "setViewportSize", "lock", "Lock", "on", "error", "executeSynchronized", "console", "log", "msg", "argsPromise", "Promise", "all", "args", "map", "x", "jsonValue", "length", "err", "goto", "storybookUrl", "storyId", "port"]
|
|
7
7
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
|
|
3
|
-
//
|
|
3
|
+
// src/resource.ts
|
|
4
4
|
import { onTestFinished } from "vitest";
|
|
5
5
|
var openAndClose = async (...resources) => {
|
|
6
6
|
for (const resourceLike of resources) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"
|
|
1
|
+
{"inputs":{"src/resource.ts":{"bytes":1532,"imports":[{"path":"vitest","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":453,"imports":[{"path":"src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"},"src/lock.ts":{"bytes":2018,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true}],"format":"esm"},"src/playwright.ts":{"bytes":13691,"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"src/lock.ts","kind":"import-statement","original":"./lock"}],"format":"esm"}},"outputs":{"dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":800},"dist/lib/node-esm/index.mjs":{"imports":[{"path":"vitest","kind":"import-statement","external":true}],"exports":["openAndClose"],"entryPoint":"src/index.ts","inputs":{"src/resource.ts":{"bytesInOutput":214},"src/index.ts":{"bytesInOutput":0}},"bytes":388},"dist/lib/node-esm/playwright.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":8060},"dist/lib/node-esm/playwright.mjs":{"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true}],"exports":["e2ePreset","setupPage","storybookUrl"],"entryPoint":"src/playwright.ts","inputs":{"src/playwright.ts":{"bytesInOutput":3144},"src/lock.ts":{"bytesInOutput":418}},"bytes":3807}}}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
|
|
3
|
-
//
|
|
4
|
-
import {
|
|
5
|
-
import { join,
|
|
3
|
+
// src/playwright.ts
|
|
4
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
5
|
+
import { dirname, join, resolve } from "node:path";
|
|
6
6
|
import pkgUp from "pkg-up";
|
|
7
7
|
|
|
8
|
-
//
|
|
8
|
+
// src/lock.ts
|
|
9
9
|
import { trigger } from "@dxos/async";
|
|
10
10
|
var Lock = class {
|
|
11
11
|
constructor() {
|
|
@@ -13,35 +13,74 @@ var Lock = class {
|
|
|
13
13
|
}
|
|
14
14
|
async executeSynchronized(fun) {
|
|
15
15
|
const prevPromise = this._lastPromise;
|
|
16
|
-
const [getPromise,
|
|
16
|
+
const [getPromise, resolve2] = trigger();
|
|
17
17
|
this._lastPromise = getPromise();
|
|
18
18
|
await prevPromise;
|
|
19
19
|
try {
|
|
20
20
|
const value = await fun();
|
|
21
21
|
return value;
|
|
22
22
|
} finally {
|
|
23
|
-
|
|
23
|
+
resolve2();
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
|
|
28
|
-
//
|
|
29
|
-
var
|
|
28
|
+
// src/playwright.ts
|
|
29
|
+
var findWorkspaceRoot = (startDir) => {
|
|
30
|
+
let dir = resolve(startDir);
|
|
31
|
+
while (dir !== "/") {
|
|
32
|
+
try {
|
|
33
|
+
const workspaceYamlPath = join(dir, "pnpm-workspace.yaml");
|
|
34
|
+
if (existsSync(workspaceYamlPath)) {
|
|
35
|
+
return dir;
|
|
36
|
+
}
|
|
37
|
+
const pkgPath = join(dir, "package.json");
|
|
38
|
+
const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
|
|
39
|
+
if (pkg.workspaces) {
|
|
40
|
+
return dir;
|
|
41
|
+
}
|
|
42
|
+
} catch {
|
|
43
|
+
}
|
|
44
|
+
const parent = dirname(dir);
|
|
45
|
+
if (parent === dir) {
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
dir = parent;
|
|
49
|
+
}
|
|
50
|
+
throw new Error("Could not find pnpm workspace root");
|
|
51
|
+
};
|
|
52
|
+
var e2ePreset = (testDir) => {
|
|
30
53
|
const packageJson = pkgUp.sync({
|
|
31
|
-
cwd
|
|
54
|
+
cwd: testDir
|
|
32
55
|
});
|
|
33
56
|
const packageDir = packageJson.split("/").slice(0, -1).join("/");
|
|
34
|
-
const
|
|
35
|
-
|
|
57
|
+
const packageDirName = packageDir.split("/").pop();
|
|
58
|
+
if (!packageDirName) {
|
|
59
|
+
throw new Error("packageDirName not found");
|
|
60
|
+
}
|
|
61
|
+
const workspaceRoot = findWorkspaceRoot(packageDir);
|
|
62
|
+
const testResultOuputDir = join(workspaceRoot, "test-results/playwright/output", packageDirName);
|
|
63
|
+
const reporterOutputFile = join(workspaceRoot, "test-results/playwright/report", `${packageDirName}.json`);
|
|
36
64
|
return {
|
|
65
|
+
testDir,
|
|
66
|
+
outputDir: testResultOuputDir,
|
|
67
|
+
// Run tests in files in parallel.
|
|
68
|
+
fullyParallel: true,
|
|
69
|
+
// Fail the build on CI if you accidentally left test.only in the source code.
|
|
70
|
+
forbidOnly: !!process.env.CI,
|
|
71
|
+
// Retry on CI only.
|
|
72
|
+
retries: process.env.CI ? 2 : 0,
|
|
73
|
+
// Opt out of parallel tests on CI.
|
|
74
|
+
workers: process.env.CI ? 1 : void 0,
|
|
75
|
+
// Reporter to use. See https://playwright.dev/docs/test-reporters.
|
|
37
76
|
reporter: process.env.CI ? [
|
|
38
77
|
[
|
|
39
78
|
"list"
|
|
40
79
|
],
|
|
41
80
|
[
|
|
42
|
-
"
|
|
81
|
+
"json",
|
|
43
82
|
{
|
|
44
|
-
outputFile:
|
|
83
|
+
outputFile: reporterOutputFile
|
|
45
84
|
}
|
|
46
85
|
]
|
|
47
86
|
] : [
|
|
@@ -92,7 +131,7 @@ var setupPage = async (browser, options = {}) => {
|
|
|
92
131
|
page
|
|
93
132
|
};
|
|
94
133
|
};
|
|
95
|
-
var storybookUrl = (storyId) => `http://localhost
|
|
134
|
+
var storybookUrl = (storyId, port = 9009) => `http://localhost:${port}/iframe.html?id=${storyId}&viewMode=story`;
|
|
96
135
|
export {
|
|
97
136
|
e2ePreset,
|
|
98
137
|
setupPage,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/playwright.ts", "../../../src/lock.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport {
|
|
5
|
-
"mappings": ";;;
|
|
6
|
-
"names": ["
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport { type Browser, type BrowserContext, type PlaywrightTestConfig, type Page } from '@playwright/test';\nimport { existsSync, readFileSync } from 'node:fs';\nimport { dirname, join, resolve } from 'node:path';\nimport pkgUp from 'pkg-up';\n\nimport { Lock } from './lock';\n\nconst findWorkspaceRoot = (startDir: string): string => {\n let dir = resolve(startDir);\n while (dir !== '/') {\n try {\n // Check for pnpm-workspace.yaml first (modern pnpm approach)\n const workspaceYamlPath = join(dir, 'pnpm-workspace.yaml');\n if (existsSync(workspaceYamlPath)) {\n return dir;\n }\n\n // Check for package.json with workspaces field (legacy approach)\n const pkgPath = join(dir, 'package.json');\n const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));\n if (pkg.workspaces) {\n return dir;\n }\n } catch {}\n const parent = dirname(dir);\n if (parent === dir) {\n break;\n }\n dir = parent;\n }\n\n throw new Error('Could not find pnpm workspace root');\n};\n\nexport const e2ePreset = (testDir: string): PlaywrightTestConfig => {\n const packageJson = pkgUp.sync({ cwd: testDir });\n const packageDir = packageJson!.split('/').slice(0, -1).join('/');\n const packageDirName = packageDir.split('/').pop();\n if (!packageDirName) {\n throw new Error('packageDirName not found');\n }\n\n const workspaceRoot = findWorkspaceRoot(packageDir);\n const testResultOuputDir = join(workspaceRoot, 'test-results/playwright/output', packageDirName);\n const reporterOutputFile = join(workspaceRoot, 'test-results/playwright/report', `${packageDirName}.json`);\n\n return {\n testDir,\n outputDir: testResultOuputDir,\n // Run tests in files in parallel.\n fullyParallel: true,\n // Fail the build on CI if you accidentally left test.only in the source code.\n forbidOnly: !!process.env.CI,\n // Retry on CI only.\n retries: process.env.CI ? 2 : 0,\n // Opt out of parallel tests on CI.\n workers: process.env.CI ? 1 : undefined,\n // Reporter to use. See https://playwright.dev/docs/test-reporters.\n reporter: process.env.CI\n ? [\n ['list'],\n [\n 'json',\n {\n outputFile: reporterOutputFile,\n },\n ],\n ]\n : [['list']],\n use: {\n trace: 'retain-on-failure',\n },\n };\n};\n\nexport type SetupOptions = {\n url?: string;\n bridgeLogs?: boolean;\n viewportSize?: Parameters<Page['setViewportSize']>[0];\n};\n\nexport const setupPage = async (browser: Browser | BrowserContext, options: SetupOptions = {}) => {\n const { url, bridgeLogs, viewportSize } = options;\n\n const context = 'newContext' in browser ? await browser.newContext() : browser;\n const page = await context.newPage();\n\n if (viewportSize) {\n await page.setViewportSize(viewportSize);\n }\n\n // TODO(wittjosiah): Remove?\n if (bridgeLogs) {\n const lock = new Lock();\n\n page.on('pageerror', async (error) => {\n await lock.executeSynchronized(async () => {\n // eslint-disable-next-line no-console\n console.log(error);\n });\n });\n\n page.on('console', async (msg) => {\n try {\n const argsPromise = Promise.all(msg.args().map((x) => x.jsonValue()));\n await lock.executeSynchronized(async () => {\n const args = await argsPromise;\n\n if (args.length > 0) {\n console.log(...args);\n } else {\n console.log(msg);\n }\n });\n } catch (err) {\n console.error('Failed to parse message', err);\n }\n });\n }\n\n if (url) {\n await page.goto(url);\n }\n\n return { context, page };\n};\n\nexport const storybookUrl = (storyId: string, port = 9009) =>\n `http://localhost:${port}/iframe.html?id=${storyId}&viewMode=story`;\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { trigger } from '@dxos/async';\n\n// Copied from @dxos/async.\nexport class Lock {\n private _lastPromise = Promise.resolve();\n\n async executeSynchronized<T>(fun: () => Promise<T>): Promise<T> {\n const prevPromise = this._lastPromise;\n const [getPromise, resolve] = trigger();\n this._lastPromise = getPromise();\n\n await prevPromise;\n try {\n const value = await fun();\n return value;\n } finally {\n resolve();\n }\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "trigger", "value", "findWorkspaceRoot", "startDir", "dir", "resolve", "workspaceYamlPath", "join", "existsSync", "pkgPath", "pkg", "JSON", "parse", "readFileSync", "workspaces", "parent", "dirname", "Error", "e2ePreset", "testDir", "packageJson", "pkgUp", "sync", "cwd", "packageDir", "split", "slice", "packageDirName", "pop", "workspaceRoot", "testResultOuputDir", "reporterOutputFile", "outputDir", "fullyParallel", "forbidOnly", "process", "env", "CI", "retries", "workers", "undefined", "reporter", "outputFile", "use", "trace", "setupPage", "browser", "options", "url", "bridgeLogs", "viewportSize", "context", "newContext", "page", "newPage", "setViewportSize", "lock", "Lock", "on", "error", "executeSynchronized", "console", "log", "msg", "argsPromise", "Promise", "all", "args", "map", "x", "jsonValue", "length", "err", "goto", "storybookUrl", "storyId", "port"]
|
|
7
7
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Browser, type BrowserContext, type PlaywrightTestConfig, type Page } from '@playwright/test';
|
|
2
|
-
export declare const e2ePreset: (
|
|
2
|
+
export declare const e2ePreset: (testDir: string) => PlaywrightTestConfig;
|
|
3
3
|
export type SetupOptions = {
|
|
4
4
|
url?: string;
|
|
5
5
|
bridgeLogs?: boolean;
|
|
@@ -9,5 +9,5 @@ export declare const setupPage: (browser: Browser | BrowserContext, options?: Se
|
|
|
9
9
|
context: BrowserContext;
|
|
10
10
|
page: Page;
|
|
11
11
|
}>;
|
|
12
|
-
export declare const storybookUrl: (storyId: string) => string;
|
|
12
|
+
export declare const storybookUrl: (storyId: string, port?: number) => string;
|
|
13
13
|
//# sourceMappingURL=playwright.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright.d.ts","sourceRoot":"","sources":["../../../src/playwright.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"playwright.d.ts","sourceRoot":"","sources":["../../../src/playwright.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,oBAAoB,EAAE,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAkC3G,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,KAAG,oBAuC3C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,SAAS,OAAO,GAAG,cAAc,EAAE,UAAS,YAAiB;;;EA4C5F,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,EAAE,aAAW,WACY,CAAC"}
|