@dxos/test-utils 0.8.4-main.3f58842 → 0.8.4-main.3fbcb4aa9b
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.map +2 -2
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/playwright.mjs +37 -6
- package/dist/lib/browser/playwright.mjs.map +3 -3
- package/dist/lib/node-esm/index.mjs.map +2 -2
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/playwright.mjs +37 -6
- package/dist/lib/node-esm/playwright.mjs.map +3 -3
- package/dist/types/src/lock.d.ts.map +1 -1
- package/dist/types/src/playwright.d.ts +1 -1
- package/dist/types/src/playwright.d.ts.map +1 -1
- package/dist/types/src/resource.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -12
- package/src/playwright.ts +25 -3
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/resource.ts"],
|
|
4
4
|
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { onTestFinished } from 'vitest';\n\ninterface ResourceLike {\n open(): Promise<any>;\n close(): Promise<any>;\n}\n\n// TODO(burdon): Replace with abstraction relating to Context object?\nexport const openAndClose = async (...resources: ResourceLike[]) => {\n for (const resourceLike of resources) {\n await resourceLike.open();\n onTestFinished(() => resourceLike.close());\n }\n};\n"],
|
|
5
|
-
"mappings": ";AAIA,SAASA,sBAAsB;AAQxB,IAAMC,eAAe,UAAUC,cAAAA;AACpC,aAAWC,gBAAgBD,WAAW;AACpC,UAAMC,aAAaC,KAAI;
|
|
6
|
-
"names": ["onTestFinished", "openAndClose", "resources", "resourceLike", "open", "
|
|
5
|
+
"mappings": ";AAIA,SAASA,sBAAsB;AAQxB,IAAMC,eAAe,UAAUC,cAAAA;AACpC,aAAWC,gBAAgBD,WAAW;AACpC,UAAMC,aAAaC,KAAI;AACvBJ,mBAAe,MAAMG,aAAaE,MAAK,CAAA;EACzC;AACF;",
|
|
6
|
+
"names": ["onTestFinished", "openAndClose", "resources", "resourceLike", "open", "close"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/resource.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/resource.ts":{"bytes":1452,"imports":[{"path":"vitest","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":376,"imports":[{"path":"src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"},"src/lock.ts":{"bytes":1942,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true}],"format":"esm"},"src/playwright.ts":{"bytes":16371,"imports":[{"path":"@playwright/test","kind":"import-statement","external":true},{"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":780},"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":9280},"dist/lib/browser/playwright.mjs":{"imports":[{"path":"@playwright/test","kind":"import-statement","external":true},{"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":3991},"src/lock.ts":{"bytesInOutput":389}},"bytes":4532}}}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// src/playwright.ts
|
|
2
|
+
import { devices } from "@playwright/test";
|
|
2
3
|
import { existsSync, readFileSync } from "@dxos/node-std/fs";
|
|
3
4
|
import { dirname, join, resolve } from "@dxos/node-std/path";
|
|
4
5
|
import pkgUp from "pkg-up";
|
|
@@ -6,9 +7,7 @@ import pkgUp from "pkg-up";
|
|
|
6
7
|
// src/lock.ts
|
|
7
8
|
import { trigger } from "@dxos/async";
|
|
8
9
|
var Lock = class {
|
|
9
|
-
|
|
10
|
-
this._lastPromise = Promise.resolve();
|
|
11
|
-
}
|
|
10
|
+
_lastPromise = Promise.resolve();
|
|
12
11
|
async executeSynchronized(fun) {
|
|
13
12
|
const prevPromise = this._lastPromise;
|
|
14
13
|
const [getPromise, resolve2] = trigger();
|
|
@@ -59,6 +58,29 @@ var e2ePreset = (testDir) => {
|
|
|
59
58
|
const workspaceRoot = findWorkspaceRoot(packageDir);
|
|
60
59
|
const testResultOuputDir = join(workspaceRoot, "test-results/playwright/output", packageDirName);
|
|
61
60
|
const reporterOutputFile = join(workspaceRoot, "test-results/playwright/report", `${packageDirName}.json`);
|
|
61
|
+
const browser = process.env.PLAYWRIGHT_BROWSER || (process.env.CI ? "all" : "chromium");
|
|
62
|
+
const projects = [
|
|
63
|
+
{
|
|
64
|
+
name: "chromium",
|
|
65
|
+
use: {
|
|
66
|
+
...devices["Desktop Chrome"]
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
name: "firefox",
|
|
71
|
+
use: {
|
|
72
|
+
...devices["Desktop Firefox"]
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
name: "webkit",
|
|
77
|
+
use: {
|
|
78
|
+
...devices["Desktop Safari"]
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
].filter((project) => {
|
|
82
|
+
return browser === "all" || project.name === browser;
|
|
83
|
+
});
|
|
62
84
|
return {
|
|
63
85
|
testDir,
|
|
64
86
|
outputDir: testResultOuputDir,
|
|
@@ -66,10 +88,12 @@ var e2ePreset = (testDir) => {
|
|
|
66
88
|
fullyParallel: true,
|
|
67
89
|
// Fail the build on CI if you accidentally left test.only in the source code.
|
|
68
90
|
forbidOnly: !!process.env.CI,
|
|
69
|
-
// Retry on CI
|
|
91
|
+
// Retry on CI to ride out the residual d&d / startup flakes while the
|
|
92
|
+
// underlying causes are still being chased. Local runs stay strict so
|
|
93
|
+
// flakes are visible while iterating.
|
|
70
94
|
retries: process.env.CI ? 2 : 0,
|
|
71
95
|
// Opt out of parallel tests on CI.
|
|
72
|
-
workers: process.env.CI ? 1 :
|
|
96
|
+
workers: process.env.CI ? 1 : 4,
|
|
73
97
|
// Reporter to use. See https://playwright.dev/docs/test-reporters.
|
|
74
98
|
reporter: process.env.CI ? [
|
|
75
99
|
[
|
|
@@ -80,6 +104,12 @@ var e2ePreset = (testDir) => {
|
|
|
80
104
|
{
|
|
81
105
|
outputFile: reporterOutputFile
|
|
82
106
|
}
|
|
107
|
+
],
|
|
108
|
+
[
|
|
109
|
+
"junit",
|
|
110
|
+
{
|
|
111
|
+
outputFile: reporterOutputFile.replace(/\.json$/, ".xml")
|
|
112
|
+
}
|
|
83
113
|
]
|
|
84
114
|
] : [
|
|
85
115
|
[
|
|
@@ -88,7 +118,8 @@ var e2ePreset = (testDir) => {
|
|
|
88
118
|
],
|
|
89
119
|
use: {
|
|
90
120
|
trace: "retain-on-failure"
|
|
91
|
-
}
|
|
121
|
+
},
|
|
122
|
+
projects
|
|
92
123
|
};
|
|
93
124
|
};
|
|
94
125
|
var setupPage = async (browser, options = {}) => {
|
|
@@ -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 { type Browser, type BrowserContext, type
|
|
5
|
-
"mappings": ";
|
|
6
|
-
"names": ["existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport { type Browser, type BrowserContext, type Page, type PlaywrightTestConfig, devices } 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 const browser = process.env.PLAYWRIGHT_BROWSER || (process.env.CI ? 'all' : 'chromium');\n const projects = [\n {\n name: 'chromium',\n use: { ...devices['Desktop Chrome'] },\n },\n {\n name: 'firefox',\n use: { ...devices['Desktop Firefox'] },\n },\n {\n name: 'webkit',\n use: { ...devices['Desktop Safari'] },\n },\n ].filter((project) => {\n return browser === 'all' || project.name === browser;\n });\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 to ride out the residual d&d / startup flakes while the\n // underlying causes are still being chased. Local runs stay strict so\n // flakes are visible while iterating.\n retries: process.env.CI ? 2 : 0,\n // Opt out of parallel tests on CI.\n workers: process.env.CI ? 1 : 4,\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 ['junit', { outputFile: reporterOutputFile.replace(/\\.json$/, '.xml') }],\n ]\n : [['list']],\n use: {\n trace: 'retain-on-failure',\n },\n projects,\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": ["devices", "existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "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", "browser", "process", "env", "PLAYWRIGHT_BROWSER", "CI", "projects", "name", "use", "devices", "filter", "project", "outputDir", "fullyParallel", "forbidOnly", "retries", "workers", "reporter", "outputFile", "replace", "trace", "setupPage", "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
|
}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/resource.ts"],
|
|
4
4
|
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { onTestFinished } from 'vitest';\n\ninterface ResourceLike {\n open(): Promise<any>;\n close(): Promise<any>;\n}\n\n// TODO(burdon): Replace with abstraction relating to Context object?\nexport const openAndClose = async (...resources: ResourceLike[]) => {\n for (const resourceLike of resources) {\n await resourceLike.open();\n onTestFinished(() => resourceLike.close());\n }\n};\n"],
|
|
5
|
-
"mappings": ";;;AAIA,SAASA,sBAAsB;AAQxB,IAAMC,eAAe,UAAUC,cAAAA;AACpC,aAAWC,gBAAgBD,WAAW;AACpC,UAAMC,aAAaC,KAAI;
|
|
6
|
-
"names": ["onTestFinished", "openAndClose", "resources", "resourceLike", "open", "
|
|
5
|
+
"mappings": ";;;AAIA,SAASA,sBAAsB;AAQxB,IAAMC,eAAe,UAAUC,cAAAA;AACpC,aAAWC,gBAAgBD,WAAW;AACpC,UAAMC,aAAaC,KAAI;AACvBJ,mBAAe,MAAMG,aAAaE,MAAK,CAAA;EACzC;AACF;",
|
|
6
|
+
"names": ["onTestFinished", "openAndClose", "resources", "resourceLike", "open", "close"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/resource.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/resource.ts":{"bytes":1452,"imports":[{"path":"vitest","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":376,"imports":[{"path":"src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"},"src/lock.ts":{"bytes":1942,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true}],"format":"esm"},"src/playwright.ts":{"bytes":16371,"imports":[{"path":"@playwright/test","kind":"import-statement","external":true},{"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":782},"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":9282},"dist/lib/node-esm/playwright.mjs":{"imports":[{"path":"@playwright/test","kind":"import-statement","external":true},{"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":3971},"src/lock.ts":{"bytesInOutput":389}},"bytes":4605}}}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
|
|
3
3
|
// src/playwright.ts
|
|
4
|
+
import { devices } from "@playwright/test";
|
|
4
5
|
import { existsSync, readFileSync } from "node:fs";
|
|
5
6
|
import { dirname, join, resolve } from "node:path";
|
|
6
7
|
import pkgUp from "pkg-up";
|
|
@@ -8,9 +9,7 @@ import pkgUp from "pkg-up";
|
|
|
8
9
|
// src/lock.ts
|
|
9
10
|
import { trigger } from "@dxos/async";
|
|
10
11
|
var Lock = class {
|
|
11
|
-
|
|
12
|
-
this._lastPromise = Promise.resolve();
|
|
13
|
-
}
|
|
12
|
+
_lastPromise = Promise.resolve();
|
|
14
13
|
async executeSynchronized(fun) {
|
|
15
14
|
const prevPromise = this._lastPromise;
|
|
16
15
|
const [getPromise, resolve2] = trigger();
|
|
@@ -61,6 +60,29 @@ var e2ePreset = (testDir) => {
|
|
|
61
60
|
const workspaceRoot = findWorkspaceRoot(packageDir);
|
|
62
61
|
const testResultOuputDir = join(workspaceRoot, "test-results/playwright/output", packageDirName);
|
|
63
62
|
const reporterOutputFile = join(workspaceRoot, "test-results/playwright/report", `${packageDirName}.json`);
|
|
63
|
+
const browser = process.env.PLAYWRIGHT_BROWSER || (process.env.CI ? "all" : "chromium");
|
|
64
|
+
const projects = [
|
|
65
|
+
{
|
|
66
|
+
name: "chromium",
|
|
67
|
+
use: {
|
|
68
|
+
...devices["Desktop Chrome"]
|
|
69
|
+
}
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
name: "firefox",
|
|
73
|
+
use: {
|
|
74
|
+
...devices["Desktop Firefox"]
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
name: "webkit",
|
|
79
|
+
use: {
|
|
80
|
+
...devices["Desktop Safari"]
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
].filter((project) => {
|
|
84
|
+
return browser === "all" || project.name === browser;
|
|
85
|
+
});
|
|
64
86
|
return {
|
|
65
87
|
testDir,
|
|
66
88
|
outputDir: testResultOuputDir,
|
|
@@ -68,10 +90,12 @@ var e2ePreset = (testDir) => {
|
|
|
68
90
|
fullyParallel: true,
|
|
69
91
|
// Fail the build on CI if you accidentally left test.only in the source code.
|
|
70
92
|
forbidOnly: !!process.env.CI,
|
|
71
|
-
// Retry on CI
|
|
93
|
+
// Retry on CI to ride out the residual d&d / startup flakes while the
|
|
94
|
+
// underlying causes are still being chased. Local runs stay strict so
|
|
95
|
+
// flakes are visible while iterating.
|
|
72
96
|
retries: process.env.CI ? 2 : 0,
|
|
73
97
|
// Opt out of parallel tests on CI.
|
|
74
|
-
workers: process.env.CI ? 1 :
|
|
98
|
+
workers: process.env.CI ? 1 : 4,
|
|
75
99
|
// Reporter to use. See https://playwright.dev/docs/test-reporters.
|
|
76
100
|
reporter: process.env.CI ? [
|
|
77
101
|
[
|
|
@@ -82,6 +106,12 @@ var e2ePreset = (testDir) => {
|
|
|
82
106
|
{
|
|
83
107
|
outputFile: reporterOutputFile
|
|
84
108
|
}
|
|
109
|
+
],
|
|
110
|
+
[
|
|
111
|
+
"junit",
|
|
112
|
+
{
|
|
113
|
+
outputFile: reporterOutputFile.replace(/\.json$/, ".xml")
|
|
114
|
+
}
|
|
85
115
|
]
|
|
86
116
|
] : [
|
|
87
117
|
[
|
|
@@ -90,7 +120,8 @@ var e2ePreset = (testDir) => {
|
|
|
90
120
|
],
|
|
91
121
|
use: {
|
|
92
122
|
trace: "retain-on-failure"
|
|
93
|
-
}
|
|
123
|
+
},
|
|
124
|
+
projects
|
|
94
125
|
};
|
|
95
126
|
};
|
|
96
127
|
var setupPage = async (browser, options = {}) => {
|
|
@@ -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 { type Browser, type BrowserContext, type
|
|
5
|
-
"mappings": ";;;
|
|
6
|
-
"names": ["existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\n/* eslint-disable no-console */\n\nimport { type Browser, type BrowserContext, type Page, type PlaywrightTestConfig, devices } 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 const browser = process.env.PLAYWRIGHT_BROWSER || (process.env.CI ? 'all' : 'chromium');\n const projects = [\n {\n name: 'chromium',\n use: { ...devices['Desktop Chrome'] },\n },\n {\n name: 'firefox',\n use: { ...devices['Desktop Firefox'] },\n },\n {\n name: 'webkit',\n use: { ...devices['Desktop Safari'] },\n },\n ].filter((project) => {\n return browser === 'all' || project.name === browser;\n });\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 to ride out the residual d&d / startup flakes while the\n // underlying causes are still being chased. Local runs stay strict so\n // flakes are visible while iterating.\n retries: process.env.CI ? 2 : 0,\n // Opt out of parallel tests on CI.\n workers: process.env.CI ? 1 : 4,\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 ['junit', { outputFile: reporterOutputFile.replace(/\\.json$/, '.xml') }],\n ]\n : [['list']],\n use: {\n trace: 'retain-on-failure',\n },\n projects,\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": ["devices", "existsSync", "readFileSync", "dirname", "join", "resolve", "pkgUp", "trigger", "Lock", "_lastPromise", "Promise", "resolve", "executeSynchronized", "fun", "prevPromise", "getPromise", "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", "browser", "process", "env", "PLAYWRIGHT_BROWSER", "CI", "projects", "name", "use", "devices", "filter", "project", "outputDir", "fullyParallel", "forbidOnly", "retries", "workers", "reporter", "outputFile", "replace", "trace", "setupPage", "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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../../src/lock.ts"],"names":[],"mappings":"AAOA,qBAAa,IAAI;IACf,OAAO,CAAC,YAAY,CAAqB;IAEnC,mBAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../../src/lock.ts"],"names":[],"mappings":"AAOA,qBAAa,IAAI;IACf,OAAO,CAAC,YAAY,CAAqB;IAEnC,mBAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAY9D;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Browser, type BrowserContext, type
|
|
1
|
+
import { type Browser, type BrowserContext, type Page, type PlaywrightTestConfig } from '@playwright/test';
|
|
2
2
|
export declare const e2ePreset: (testDir: string) => PlaywrightTestConfig;
|
|
3
3
|
export type SetupOptions = {
|
|
4
4
|
url?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright.d.ts","sourceRoot":"","sources":["../../../src/playwright.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"playwright.d.ts","sourceRoot":"","sources":["../../../src/playwright.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,IAAI,EAAE,KAAK,oBAAoB,EAAW,MAAM,kBAAkB,CAAC;AAkCpH,eAAO,MAAM,SAAS,YAAa,MAAM,KAAG,oBA6D3C,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,YAAmB,OAAO,GAAG,cAAc,YAAW,YAAY;;;EA4CvF,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,MAAM,0BACyB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/resource.ts"],"names":[],"mappings":"AAMA,UAAU,YAAY;IACpB,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CACvB;AAGD,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/resource.ts"],"names":[],"mappings":"AAMA,UAAU,YAAY;IACpB,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CACvB;AAGD,eAAO,MAAM,YAAY,iBAAwB,YAAY,EAAE,kBAK9D,CAAC"}
|