@o3r/testing 13.0.0-prerelease.2 → 13.0.0-prerelease.3
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/collection.json +4 -2
- package/package.json +11 -11
- package/schematics/ng-add/playwright/index.d.ts.map +1 -1
- package/schematics/ng-add/playwright/index.js +0 -9
- package/schematics/ng-add/playwright/index.js.map +1 -1
- package/schematics/ng-add/playwright/templates/e2e-playwright/empty-test.e2e.ts.template +6 -0
- package/schematics/ng-add/playwright/templates/e2e-playwright/playwright-config.ts.template +5 -4
- package/schematics/ng-add/templates/workspace/jest.config.ut.js.template +2 -1
- package/schematics/ng-add/templates/workspace/tsconfig.jest.json.template +2 -1
- package/schematics/playwright/sanity/schema.json +1 -1
- package/schematics/playwright/scenario/schema.json +1 -1
- package/schematics/ng-add/playwright/templates/e2e-playwright/playwright-config.sanity.ts.template +0 -12
- package/schematics/ng-add/playwright/templates/e2e-playwright/sanity/__sanity@dasherize__.e2e.ts.template +0 -8
- package/schematics/ng-add/playwright/templates/e2e-playwright/scenarios/__name@dasherize__.e2e-playwright-spec.ts.template +0 -20
- package/schematics/ng-add/playwright/templates/e2e-playwright/utils/base-scenario.ts.template +0 -27
- package/schematics/ng-add/playwright/templates/e2e-playwright/utils/index.ts.template +0 -1
package/collection.json
CHANGED
|
@@ -8,13 +8,15 @@
|
|
|
8
8
|
"aliases": ["install", "i"]
|
|
9
9
|
},
|
|
10
10
|
"playwright-scenario": {
|
|
11
|
-
"
|
|
11
|
+
"hidden": true,
|
|
12
|
+
"description": "[Deprecated - Removed in v14] Generate a Playwright scenario into the project.",
|
|
12
13
|
"factory": "./schematics/playwright/scenario/index#ngGeneratePlaywrightScenario",
|
|
13
14
|
"schema": "./schematics/playwright/scenario/schema.json",
|
|
14
15
|
"aliases": ["o3r-playwright-scenario"]
|
|
15
16
|
},
|
|
16
17
|
"playwright-sanity": {
|
|
17
|
-
"
|
|
18
|
+
"hidden": true,
|
|
19
|
+
"description": "[Deprecated - Removed in v14] Generate a Playwright sanity into the project.",
|
|
18
20
|
"factory": "./schematics/playwright/sanity/index#ngGeneratePlaywrightSanity",
|
|
19
21
|
"schema": "./schematics/playwright/sanity/schema.json",
|
|
20
22
|
"aliases": ["o3r-playwright-sanity"]
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/testing",
|
|
3
|
-
"version": "13.0.0-prerelease.
|
|
3
|
+
"version": "13.0.0-prerelease.3",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -100,9 +100,9 @@
|
|
|
100
100
|
"@material/slider": "^14.0.0",
|
|
101
101
|
"@ngrx/store": "^20.0.0",
|
|
102
102
|
"@ngx-translate/core": "^15.0.0 || ~16.0.4",
|
|
103
|
-
"@o3r/core": "^13.0.0-prerelease.
|
|
104
|
-
"@o3r/localization": "^13.0.0-prerelease.
|
|
105
|
-
"@o3r/schematics": "^13.0.0-prerelease.
|
|
103
|
+
"@o3r/core": "^13.0.0-prerelease.3",
|
|
104
|
+
"@o3r/localization": "^13.0.0-prerelease.3",
|
|
105
|
+
"@o3r/schematics": "^13.0.0-prerelease.3",
|
|
106
106
|
"@playwright/test": "^1.49.0",
|
|
107
107
|
"@schematics/angular": "^20.0.0",
|
|
108
108
|
"pixelmatch": "^7.0.0",
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
}
|
|
168
168
|
},
|
|
169
169
|
"dependencies": {
|
|
170
|
-
"@o3r/schematics": "^13.0.0-prerelease.
|
|
170
|
+
"@o3r/schematics": "^13.0.0-prerelease.3",
|
|
171
171
|
"esbuild": "~0.25.1",
|
|
172
172
|
"module-from-string": "^3.2.0",
|
|
173
173
|
"tslib": "^2.6.2"
|
|
@@ -194,12 +194,12 @@
|
|
|
194
194
|
"@ngx-translate/core": "~16.0.4",
|
|
195
195
|
"@nx/eslint-plugin": "~21.3.11",
|
|
196
196
|
"@nx/jest": "~21.3.11",
|
|
197
|
-
"@o3r/build-helpers": "^13.0.0-prerelease.
|
|
198
|
-
"@o3r/core": "^13.0.0-prerelease.
|
|
199
|
-
"@o3r/eslint-plugin": "^13.0.0-prerelease.
|
|
200
|
-
"@o3r/localization": "^13.0.0-prerelease.
|
|
201
|
-
"@o3r/test-helpers": "^13.0.0-prerelease.
|
|
202
|
-
"@playwright/test": "~1.
|
|
197
|
+
"@o3r/build-helpers": "^13.0.0-prerelease.3",
|
|
198
|
+
"@o3r/core": "^13.0.0-prerelease.3",
|
|
199
|
+
"@o3r/eslint-plugin": "^13.0.0-prerelease.3",
|
|
200
|
+
"@o3r/localization": "^13.0.0-prerelease.3",
|
|
201
|
+
"@o3r/test-helpers": "^13.0.0-prerelease.3",
|
|
202
|
+
"@playwright/test": "~1.55.0",
|
|
203
203
|
"@schematics/angular": "~20.0.0",
|
|
204
204
|
"@stylistic/eslint-plugin": "~5.2.0",
|
|
205
205
|
"@swc/helpers": "~0.5.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,eAAe,EAIpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAWzB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,eAAe,EAIpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAWzB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,IAAI,CAoElH"}
|
|
@@ -52,25 +52,16 @@ test-results
|
|
|
52
52
|
const packageJson = tree.readJson(packageJsonPath);
|
|
53
53
|
packageJson.scripts ||= {};
|
|
54
54
|
packageJson.scripts['test:playwright'] ||= 'playwright test --config=e2e-playwright/playwright-config.ts';
|
|
55
|
-
packageJson.scripts['test:playwright:sanity'] ||= 'playwright test --config=e2e-playwright/playwright-config.sanity.ts';
|
|
56
55
|
tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
|
|
57
56
|
}
|
|
58
57
|
// generate files
|
|
59
58
|
if (!tree.exists(path.posix.join(workingDirectory, 'e2e-playwright', 'playwright-config.ts'))) {
|
|
60
|
-
const name = 'my-scenario';
|
|
61
|
-
const scenarioName = core_1.strings.capitalize(core_1.strings.camelize(name));
|
|
62
|
-
const sanity = 'my-sanity';
|
|
63
|
-
const sanityName = core_1.strings.capitalize(core_1.strings.camelize(sanity));
|
|
64
59
|
const startCommand = `${(0, schematics_2.getPackageManager)()} run start`;
|
|
65
60
|
const project = options?.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
66
61
|
const serverPort = project?.architect?.serve?.options?.port || '4200';
|
|
67
62
|
const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./playwright/templates'), [
|
|
68
63
|
(0, schematics_1.template)({
|
|
69
64
|
...core_1.strings,
|
|
70
|
-
name,
|
|
71
|
-
scenarioName,
|
|
72
|
-
sanity,
|
|
73
|
-
sanityName,
|
|
74
65
|
serverPort,
|
|
75
66
|
startCommand
|
|
76
67
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":";;AAsCA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/playwright/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,16 @@ const FIVE_MINUTES = 1_000 * 60 * 5;
|
|
|
9
9
|
const reportsFolder = path.join(__dirname, '..', 'playwright-reports');
|
|
10
10
|
|
|
11
11
|
const config = defineConfig({
|
|
12
|
-
testDir:
|
|
13
|
-
testMatch: /.*\.e2e
|
|
12
|
+
testDir: '.',
|
|
13
|
+
testMatch: /.*\.e2e\.ts$/,
|
|
14
|
+
forbidOnly: !!process.env.CI,
|
|
15
|
+
retries: process.env.CI ? 3 : 0,
|
|
16
|
+
workers: process.env.CI ? 1 : undefined,
|
|
14
17
|
reporter: [
|
|
15
18
|
['list'],
|
|
16
19
|
['junit', {outputFile: path.join(reportsFolder, 'junit', 'reporter.xml')}],
|
|
17
20
|
['html', {open: 'never', outputFolder: path.join(reportsFolder, 'html')}]
|
|
18
21
|
],
|
|
19
|
-
retries: process.env.CI ? 3 : 0,
|
|
20
|
-
forbidOnly: !!process.env.CI,
|
|
21
22
|
timeout: FIVE_MINUTES,
|
|
22
23
|
use: {
|
|
23
24
|
baseURL: process.env.PLAYWRIGHT_TARGET_URL || 'http://localhost:<%= serverPort %>/',
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
3
|
"$id": "ngGeneratePlaywrightSanitySchematicsSchema",
|
|
4
4
|
"title": "Generate Playwright sanity",
|
|
5
|
-
"description": "ng generate Playwright sanity",
|
|
5
|
+
"description": "[Deprecated - Removed in v14] ng generate Playwright sanity",
|
|
6
6
|
"properties": {
|
|
7
7
|
"projectName": {
|
|
8
8
|
"type": "string",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
3
|
"$id": "ngGeneratePlaywrightScenarioSchematicsSchema",
|
|
4
4
|
"title": "Generate Playwright scenario",
|
|
5
|
-
"description": "ng generate Playwright scenario",
|
|
5
|
+
"description": "[Deprecated - Removed in v14] ng generate Playwright scenario",
|
|
6
6
|
"properties": {
|
|
7
7
|
"projectName": {
|
|
8
8
|
"type": "string",
|
package/schematics/ng-add/playwright/templates/e2e-playwright/playwright-config.sanity.ts.template
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { defineConfig } from '@playwright/test';
|
|
2
|
-
import * as path from 'node:path';
|
|
3
|
-
|
|
4
|
-
import {default as defaultConfig} from './playwright-config';
|
|
5
|
-
|
|
6
|
-
const config = defineConfig({
|
|
7
|
-
...defaultConfig,
|
|
8
|
-
testDir: path.join(__dirname, 'sanity'),
|
|
9
|
-
testMatch: /.*\.e2e\.ts$/
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
export default config;
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { expect, test } from '@playwright/test';
|
|
2
|
-
import { BaseScenario } from '../utils';
|
|
3
|
-
|
|
4
|
-
export class <%= classify(scenarioName) %> extends BaseScenario {
|
|
5
|
-
protected <%= camelize(scenarioName) %>() {
|
|
6
|
-
test.describe('Empty <%= classify(scenarioName) %> tests', () => {
|
|
7
|
-
test('Empty test', async ({ page }) => {
|
|
8
|
-
await page.goto('/');
|
|
9
|
-
await expect(page.locator('body')).toBeAttached();
|
|
10
|
-
});
|
|
11
|
-
});
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
/** @inheritDoc */
|
|
15
|
-
public performFlow() {
|
|
16
|
-
this.<%= camelize(scenarioName) %>();
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
new <%= classify(scenarioName) %>().run();
|
package/schematics/ng-add/playwright/templates/e2e-playwright/utils/base-scenario.ts.template
DELETED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { test } from '@playwright/test';
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Interface to define the interface of a flow test
|
|
5
|
-
*/
|
|
6
|
-
export interface Flow {
|
|
7
|
-
/**
|
|
8
|
-
* Run the flow
|
|
9
|
-
*/
|
|
10
|
-
performFlow(): void;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
/**
|
|
14
|
-
* Base scenario for e2e scenarios.
|
|
15
|
-
* Init the fetch manager and call `performFlow` method.
|
|
16
|
-
* E2E Booking flows should inherit from this class.
|
|
17
|
-
*/
|
|
18
|
-
export abstract class BaseScenario implements Flow {
|
|
19
|
-
|
|
20
|
-
public abstract performFlow();
|
|
21
|
-
|
|
22
|
-
public run() {
|
|
23
|
-
test.describe.serial(this.constructor.name, () => {
|
|
24
|
-
this.performFlow();
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from './base-scenario';
|