@axe-core/watcher 4.5.1-rc.a034129e → 4.6.0-next.02b0ea62
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/EXTENSION-LICENSES-3RD-PARTY.md +2 -2
- package/dist/utils/normalizeAllowedOrigins.d.ts +13 -0
- package/dist/utils/normalizeAllowedOrigins.js +49 -0
- package/dist/utils/normalizeAllowedOrigins.js.map +1 -0
- package/dist/utils/sync-fetch.js +1 -0
- package/dist/utils/sync-fetch.js.map +1 -1
- package/dist/utils/writeVariables.d.ts +43 -1
- package/dist/utils/writeVariables.js +21 -1
- package/dist/utils/writeVariables.js.map +1 -1
- package/dist/wdio/wdio.js +36 -14
- package/dist/wdio/wdio.js.map +1 -1
- package/extension/axe-versions/axe-core@4.13.0/axe.min.js +12 -0
- package/extension/axe-versions/axe-core@4.13.0/gather-internals.js +219 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/README.md +9 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/_template.json +1157 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/da.json +799 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/de.json +1127 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/el.json +1069 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/es.json +790 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/eu.json +789 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/fr.json +994 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/he.json +1017 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/it.json +1108 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/ja.json +1128 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/ko.json +1003 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/nb.json +799 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/nl.json +48 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/pl.json +1109 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/pt_BR.json +970 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/pt_PT.json +1123 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/ru.json +1127 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/sv.json +1147 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/zh_CN.json +1116 -0
- package/extension/axe-versions/axe-core@4.13.0/locales/zh_TW.json +1108 -0
- package/extension/axe-versions-mapper.js +2 -0
- package/extension/axe.js +1 -1
- package/extension/axe.js.LICENSE.txt +1 -1
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/extension/gather-internals.js +1 -1
- package/package.json +8 -11
|
@@ -35,7 +35,7 @@ SOFTWARE.
|
|
|
35
35
|
|
|
36
36
|
## brace-expansion
|
|
37
37
|
|
|
38
|
-
**Version**: 5.0.
|
|
38
|
+
**Version**: 5.0.9
|
|
39
39
|
|
|
40
40
|
**License**: MIT
|
|
41
41
|
|
|
@@ -188,7 +188,7 @@ SOFTWARE.
|
|
|
188
188
|
|
|
189
189
|
## minimatch
|
|
190
190
|
|
|
191
|
-
**Version**: 10.2.
|
|
191
|
+
**Version**: 10.2.6
|
|
192
192
|
|
|
193
193
|
**License**: BlueOak-1.0.0
|
|
194
194
|
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Validate `allowedOrigins` and return the canonical
|
|
3
|
+
* `scheme://host[:port]` form of each entry.
|
|
4
|
+
*
|
|
5
|
+
* Normalizing matters: axe-core compares each entry byte-for-byte against
|
|
6
|
+
* `MessageEvent.origin` when deciding whether to accept a cross-frame message,
|
|
7
|
+
* so `'https://pay.example.com/'` (trailing slash) would never match and the
|
|
8
|
+
* frame would simply go unscanned — the exact silent gap this option exists to
|
|
9
|
+
* close. Failing loudly here, at config time, beats a scan that quietly reports
|
|
10
|
+
* nothing for the frame.
|
|
11
|
+
*/
|
|
12
|
+
declare function normalizeAllowedOrigins(origins: unknown): string[];
|
|
13
|
+
export default normalizeAllowedOrigins;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const constants_1 = require("./constants");
|
|
4
|
+
const UNSAFE_ALL_ORIGINS = '<unsafe_all_origins>';
|
|
5
|
+
const SAME_ORIGIN = '<same_origin>';
|
|
6
|
+
function isNonAscii(value) {
|
|
7
|
+
return [...value].some(char => (char.codePointAt(0) ?? 0) > 127);
|
|
8
|
+
}
|
|
9
|
+
const example = `Example: allowedOrigins: ['https://pay.example.com']. See ${constants_1.DOCS_LINK}`;
|
|
10
|
+
function normalizeAllowedOrigins(origins) {
|
|
11
|
+
if (!Array.isArray(origins)) {
|
|
12
|
+
throw new Error(`Invalid \`allowedOrigins\`: ${String(origins)}. It must be an array of origin strings. ${example}`);
|
|
13
|
+
}
|
|
14
|
+
const normalized = origins.map(origin => {
|
|
15
|
+
if (typeof origin !== 'string') {
|
|
16
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${String(origin)}. Each entry must be an origin string. ${example}`);
|
|
17
|
+
}
|
|
18
|
+
if (origin.includes('*') || origin === UNSAFE_ALL_ORIGINS) {
|
|
19
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${origin}. Wildcards are not supported — list every origin you want scanned explicitly so page content is only ever shared with frames you named. ${example}`);
|
|
20
|
+
}
|
|
21
|
+
if (origin === SAME_ORIGIN) {
|
|
22
|
+
return origin;
|
|
23
|
+
}
|
|
24
|
+
if (isNonAscii(origin)) {
|
|
25
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${origin}. Use the punycode form of an international domain, e.g. 'https://xn--e1afmkfd.xn--p1ai'. ${example}`);
|
|
26
|
+
}
|
|
27
|
+
let url;
|
|
28
|
+
try {
|
|
29
|
+
url = new URL(origin);
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${origin}. Entries must be absolute origins including the scheme. ${example}`);
|
|
33
|
+
}
|
|
34
|
+
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
|
35
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${origin}. Only http: and https: origins can be scanned. ${example}`);
|
|
36
|
+
}
|
|
37
|
+
if (url.pathname !== '/' ||
|
|
38
|
+
url.search !== '' ||
|
|
39
|
+
url.hash !== '' ||
|
|
40
|
+
url.username !== '' ||
|
|
41
|
+
url.password !== '') {
|
|
42
|
+
throw new Error(`Invalid \`allowedOrigins\` entry: ${origin}. Entries must be an origin only — no path, query, fragment, or credentials. ${example}`);
|
|
43
|
+
}
|
|
44
|
+
return url.origin;
|
|
45
|
+
});
|
|
46
|
+
return [...new Set(normalized)];
|
|
47
|
+
}
|
|
48
|
+
exports.default = normalizeAllowedOrigins;
|
|
49
|
+
//# sourceMappingURL=normalizeAllowedOrigins.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizeAllowedOrigins.js","sourceRoot":"","sources":["../../src/utils/normalizeAllowedOrigins.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AAOvC,MAAM,kBAAkB,GAAG,sBAAsB,CAAA;AAQjD,MAAM,WAAW,GAAG,eAAe,CAAA;AAOnC,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAA;AAClE,CAAC;AAED,MAAM,OAAO,GAAG,6DAA6D,qBAAS,EAAE,CAAA;AAaxF,SAAS,uBAAuB,CAAC,OAAgB;IAK/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,+BAA+B,MAAM,CAAC,OAAO,CAAC,4CAA4C,OAAO,EAAE,CACpG,CAAA;IACH,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,CAAC,MAAM,CAAC,0CAA0C,OAAO,EAAE,CACvG,CAAA;QACH,CAAC;QAMD,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,4IAA4I,OAAO,EAAE,CACjM,CAAA;QACH,CAAC;QAED,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAA;QACf,CAAC;QAQD,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,6FAA6F,OAAO,EAAE,CAClJ,CAAA;QACH,CAAC;QAED,IAAI,GAAQ,CAAA;QACZ,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;QACvB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,4DAA4D,OAAO,EAAE,CACjH,CAAA;QACH,CAAC;QAED,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,mDAAmD,OAAO,EAAE,CACxG,CAAA;QACH,CAAC;QAKD,IACE,GAAG,CAAC,QAAQ,KAAK,GAAG;YACpB,GAAG,CAAC,MAAM,KAAK,EAAE;YACjB,GAAG,CAAC,IAAI,KAAK,EAAE;YACf,GAAG,CAAC,QAAQ,KAAK,EAAE;YACnB,GAAG,CAAC,QAAQ,KAAK,EAAE,EACnB,CAAC;YACD,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,gFAAgF,OAAO,EAAE,CACrI,CAAA;QACH,CAAC;QAED,OAAO,GAAG,CAAC,MAAM,CAAA;IACnB,CAAC,CAAC,CAAA;IAIF,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;AACjC,CAAC;AAED,kBAAe,uBAAuB,CAAA"}
|
package/dist/utils/sync-fetch.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-fetch.js","sourceRoot":"","sources":["../../src/utils/sync-fetch.ts"],"names":[],"mappings":";;;AA2BA,
|
|
1
|
+
{"version":3,"file":"sync-fetch.js","sourceRoot":"","sources":["../../src/utils/sync-fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,47 @@ interface AxeConfiguration {
|
|
|
85
85
|
* ```
|
|
86
86
|
*/
|
|
87
87
|
excludeUrlPatterns?: string[];
|
|
88
|
+
/**
|
|
89
|
+
* Opt in to scanning cross-origin `<iframe>`s by listing the origins you want
|
|
90
|
+
* scanned. Same-origin iframes are always scanned; cross-origin iframes are
|
|
91
|
+
* skipped unless their origin appears here.
|
|
92
|
+
*
|
|
93
|
+
* Wildcards are not supported — every origin must be named explicitly, so
|
|
94
|
+
* page content is only ever shared with frames you listed.
|
|
95
|
+
*
|
|
96
|
+
* Every origin you list can be driven by, and return this document's markup
|
|
97
|
+
* to, any frame that directly embeds it and is itself either the top-level
|
|
98
|
+
* page or another origin you listed. List only embeds you trust jointly.
|
|
99
|
+
*
|
|
100
|
+
* This is axe-core's `allowedOrigins`, with two differences. Your own origin
|
|
101
|
+
* is always allowed, so you only list the embedded origins you want covered
|
|
102
|
+
* (axe-core replaces its list wholesale, and requiring you to re-list your own
|
|
103
|
+
* origin would mean re-stating a URL that changes between local, CI and
|
|
104
|
+
* staging). And `<unsafe_all_origins>` is rejected rather than honoured, since
|
|
105
|
+
* an allowlist you cannot enumerate is not an allowlist. `<same_origin>` is
|
|
106
|
+
* accepted but redundant.
|
|
107
|
+
*
|
|
108
|
+
* Scan time grows with every frame you add: each contributes its whole DOM,
|
|
109
|
+
* and the child payload is stringified, posted, parsed and merged serially on
|
|
110
|
+
* the parent's main thread. Measured at roughly +330ms per 300-row frame
|
|
111
|
+
* against a 1550ms baseline — about +21% for one frame, +65% for three — and
|
|
112
|
+
* with `autoAnalyze` that cost recurs on every wrapped interaction, so a
|
|
113
|
+
* 200-interaction suite with three frames adds minutes of wall clock. Scope
|
|
114
|
+
* the list to the embeds you actually need covered.
|
|
115
|
+
*
|
|
116
|
+
* Note that auto-analysis cannot see changes made *inside* a frame — the
|
|
117
|
+
* watcher's DOM observer only runs in the top frame, and a `MutationObserver`
|
|
118
|
+
* cannot observe a child document. An allowlisted frame is therefore scanned as
|
|
119
|
+
* of the last change to the top document. After interacting inside a frame,
|
|
120
|
+
* call `controller.analyze()` to capture the resulting state.
|
|
121
|
+
*
|
|
122
|
+
* @example
|
|
123
|
+
* ```js
|
|
124
|
+
* allowedOrigins: ['https://pay.example.com']
|
|
125
|
+
* allowedOrigins: ['https://pay.example.com', 'https://docs.example.com']
|
|
126
|
+
* ```
|
|
127
|
+
*/
|
|
128
|
+
allowedOrigins?: string[];
|
|
88
129
|
/**
|
|
89
130
|
* A unique identifier for the build or test run. This is useful for:
|
|
90
131
|
*
|
|
@@ -193,9 +234,10 @@ export interface Variables {
|
|
|
193
234
|
experimental_advanced_rules?: boolean;
|
|
194
235
|
element_internals?: boolean;
|
|
195
236
|
exclude_url_patterns: string[] | null;
|
|
237
|
+
allowed_origins: string[] | null;
|
|
196
238
|
axe_core_settings?: AxeCoreSettings | null;
|
|
197
239
|
timeout: Required<Timeouts>;
|
|
198
240
|
}
|
|
199
241
|
/** Write the user's settings to the disk, so the extension can load them. */
|
|
200
|
-
declare function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress, isPlaywrightTest, isWdioTestrunner, serverURL, sessionId, runContext, runOptions, excludeUrlPatterns, buildID, timeout, takeScreenshots, screenshotDir, experimentalAdvancedRules, elementInternals, projectId, git: gitConfig }: WriteVariablesParams): void;
|
|
242
|
+
declare function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress, isPlaywrightTest, isWdioTestrunner, serverURL, sessionId, runContext, runOptions, excludeUrlPatterns, allowedOrigins, buildID, timeout, takeScreenshots, screenshotDir, experimentalAdvancedRules, elementInternals, projectId, git: gitConfig }: WriteVariablesParams): void;
|
|
201
243
|
export default writeVariables;
|
|
@@ -48,6 +48,7 @@ const createDebugger_1 = __importDefault(require("../createDebugger"));
|
|
|
48
48
|
const initializeSession_1 = __importDefault(require("./initializeSession"));
|
|
49
49
|
const validateAxeRunContext_1 = require("./validateAxeRunContext");
|
|
50
50
|
const isValidExcludePattern_1 = __importDefault(require("./isValidExcludePattern"));
|
|
51
|
+
const normalizeAllowedOrigins_1 = __importDefault(require("./normalizeAllowedOrigins"));
|
|
51
52
|
const writeExtensionManifest_1 = __importDefault(require("./writeExtensionManifest"));
|
|
52
53
|
const isCI_1 = require("./isCI");
|
|
53
54
|
const debugLogger = (0, createDebugger_1.default)('config:writeVariables');
|
|
@@ -73,7 +74,17 @@ const DEFAULT_TIMEOUT = {
|
|
|
73
74
|
analyze: 5000,
|
|
74
75
|
flush: 5000
|
|
75
76
|
};
|
|
76
|
-
function
|
|
77
|
+
function crossOriginTimeouts(allowed) {
|
|
78
|
+
if (!allowed?.length) {
|
|
79
|
+
return {};
|
|
80
|
+
}
|
|
81
|
+
const scanBound = 10000;
|
|
82
|
+
return {
|
|
83
|
+
analyze: Math.max(DEFAULT_TIMEOUT.analyze, scanBound),
|
|
84
|
+
flush: Math.max(DEFAULT_TIMEOUT.flush, scanBound)
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress, isPlaywrightTest, isWdioTestrunner, serverURL, sessionId, runContext, runOptions, excludeUrlPatterns, allowedOrigins, buildID, timeout = {}, takeScreenshots, screenshotDir, experimentalAdvancedRules, elementInternals, projectId, git: gitConfig }) {
|
|
77
88
|
const screenshotsEnabled = !!takeScreenshots;
|
|
78
89
|
debugLogger('Received configuration:', {
|
|
79
90
|
apiKey: '<redacted>',
|
|
@@ -84,6 +95,7 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
|
84
95
|
...(runOptions !== undefined && { runOptions }),
|
|
85
96
|
...(configurationOverrides !== undefined && { configurationOverrides }),
|
|
86
97
|
...(excludeUrlPatterns !== undefined && { excludeUrlPatterns }),
|
|
98
|
+
...(allowedOrigins !== undefined && { allowedOrigins }),
|
|
87
99
|
...(buildID !== undefined && { buildID }),
|
|
88
100
|
...(projectId !== undefined && { projectId }),
|
|
89
101
|
...(gitConfig !== undefined && { git: gitConfig }),
|
|
@@ -111,6 +123,12 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
|
111
123
|
(0, validateAxeRunOptions_1.validateAxeRunOptions)(runOptions);
|
|
112
124
|
debugLogger('Validated runOptions:', runOptions);
|
|
113
125
|
}
|
|
126
|
+
let normalizedCrossOrigins = null;
|
|
127
|
+
if (allowedOrigins !== undefined) {
|
|
128
|
+
const normalized = (0, normalizeAllowedOrigins_1.default)(allowedOrigins);
|
|
129
|
+
normalizedCrossOrigins = normalized.length ? normalized : null;
|
|
130
|
+
debugLogger('Validated allowedOrigins:', normalizedCrossOrigins);
|
|
131
|
+
}
|
|
114
132
|
if (configurationOverrides) {
|
|
115
133
|
debugLogger('configurationOverrides:', configurationOverrides);
|
|
116
134
|
const hasInvalidAccessibilityStandard = configurationOverrides.accessibilityStandard &&
|
|
@@ -208,9 +226,11 @@ function writeVariables({ apiKey, autoAnalyze, configurationOverrides, cypress,
|
|
|
208
226
|
run_options: runOptions || null,
|
|
209
227
|
git_data: gitData,
|
|
210
228
|
exclude_url_patterns: excludeUrlPatterns || null,
|
|
229
|
+
allowed_origins: normalizedCrossOrigins,
|
|
211
230
|
axe_core_settings: axe_core_settings || null,
|
|
212
231
|
timeout: {
|
|
213
232
|
...DEFAULT_TIMEOUT,
|
|
233
|
+
...crossOriginTimeouts(normalizedCrossOrigins),
|
|
214
234
|
...timeout
|
|
215
235
|
}
|
|
216
236
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAA6B;AAC7B,4CAAmB;AACnB,gDAAuB;AACvB,2CAAgD;AAChD,mDAAsD;AACtD,uDAAyD;AACzD,2EAAuE;AACvE,mEAAgF;AAChF,uEAA8C;AAC9C,4EAA6E;AAC7E,mEAA+D;AAC/D,oFAA2D;AAC3D,sFAAoD;AACpD,iCAA6B;AAE7B,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,uBAAuB,CAAC,CAAA;AAI3D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAmDjD,MAAM,6BAA6B,GAA4B;IAC7D,KAAK;IACL,cAAc;IACd,aAAa;IACb,YAAY;IACZ,cAAc;IACd,aAAa;IACb,YAAY;IACZ,cAAc;IACd,aAAa;IACb,YAAY;IACZ,mBAAmB;IACnB,YAAY;IACZ,QAAQ;CACT,CAAA;
|
|
1
|
+
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":"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"}
|
package/dist/wdio/wdio.js
CHANGED
|
@@ -10,6 +10,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
10
10
|
const Controller_1 = __importDefault(require("../Controller"));
|
|
11
11
|
const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
|
12
12
|
const constantsNode_1 = require("../utils/constantsNode");
|
|
13
|
+
const constants_1 = require("../utils/constants");
|
|
13
14
|
const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError");
|
|
14
15
|
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
|
15
16
|
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
|
@@ -19,21 +20,42 @@ const noop = () => {
|
|
|
19
20
|
let currentWdioTestContext = null;
|
|
20
21
|
const suiteStack = [];
|
|
21
22
|
const suitePushed = [];
|
|
23
|
+
const CHROME_OPTIONS = 'goog:chromeOptions';
|
|
24
|
+
const EDGE_OPTIONS = 'ms:edgeOptions';
|
|
25
|
+
function isEdgeBrowserName(browserName) {
|
|
26
|
+
return (typeof browserName === 'string' &&
|
|
27
|
+
['microsoftedge', 'msedge', 'edge'].includes(browserName.toLowerCase()));
|
|
28
|
+
}
|
|
29
|
+
function browserOptionsKey(browserName) {
|
|
30
|
+
return isEdgeBrowserName(browserName) ? EDGE_OPTIONS : CHROME_OPTIONS;
|
|
31
|
+
}
|
|
32
|
+
function readCapabilityArgs(args, optionsKey) {
|
|
33
|
+
if (args === undefined || args === null) {
|
|
34
|
+
return [];
|
|
35
|
+
}
|
|
36
|
+
if (Array.isArray(args) && [...args].every(arg => typeof arg === 'string')) {
|
|
37
|
+
return args;
|
|
38
|
+
}
|
|
39
|
+
throw new Error(`The "args" property of your "${optionsKey}" browser capability must be an array of strings. To resolve this problem, set "args" to an array of browser command-line flags (for example ["--window-size=1280,720"]) or remove it, or see ${constants_1.DOCS_LINK} for more troubleshooting.`);
|
|
40
|
+
}
|
|
22
41
|
function wdioConfig({ axe, ...options }) {
|
|
23
42
|
(0, writeVariables_1.default)(axe);
|
|
24
|
-
const
|
|
25
|
-
const
|
|
43
|
+
const capabilities = options.capabilities ?? {};
|
|
44
|
+
const browserName = capabilities.browserName ?? 'chrome';
|
|
45
|
+
const optionsKey = browserOptionsKey(browserName);
|
|
46
|
+
const browserOpts = capabilities[optionsKey] || {};
|
|
47
|
+
const args = readCapabilityArgs(browserOpts.args, optionsKey);
|
|
26
48
|
if (['headless', '--headless'].some(flag => args.includes(flag))) {
|
|
27
|
-
throw new headlessNotSupportedError_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${
|
|
49
|
+
throw new headlessNotSupportedError_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${optionsKey}" browser capability configuration.`);
|
|
28
50
|
}
|
|
29
51
|
(0, checkUserArgs_1.checkUserArgs)(args);
|
|
30
52
|
return {
|
|
31
53
|
...options,
|
|
32
54
|
capabilities: {
|
|
33
|
-
browserName
|
|
34
|
-
...
|
|
35
|
-
|
|
36
|
-
...
|
|
55
|
+
browserName,
|
|
56
|
+
...capabilities,
|
|
57
|
+
[optionsKey]: {
|
|
58
|
+
...browserOpts,
|
|
37
59
|
args: (0, mergeChromeArgs_1.default)(args, {
|
|
38
60
|
disableOtherExtensions: true,
|
|
39
61
|
disableLoadExtensionCommandFeature: true
|
|
@@ -42,7 +64,6 @@ function wdioConfig({ axe, ...options }) {
|
|
|
42
64
|
}
|
|
43
65
|
};
|
|
44
66
|
}
|
|
45
|
-
const CHROME_OPTIONS = 'goog:chromeOptions';
|
|
46
67
|
function wdioTestRunner(...params) {
|
|
47
68
|
let axe;
|
|
48
69
|
let config;
|
|
@@ -60,15 +81,16 @@ function wdioTestRunner(...params) {
|
|
|
60
81
|
{ [CHROME_OPTIONS]: { args: [] } }
|
|
61
82
|
];
|
|
62
83
|
const firstCapability = capabilities[0];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const args =
|
|
84
|
+
const optionsKey = browserOptionsKey(firstCapability.browserName);
|
|
85
|
+
firstCapability[optionsKey] = firstCapability[optionsKey] || {};
|
|
86
|
+
const browserOpts = firstCapability[optionsKey];
|
|
87
|
+
const args = readCapabilityArgs(browserOpts.args, optionsKey);
|
|
88
|
+
browserOpts.args = args;
|
|
67
89
|
if (['headless', '--headless'].some(flag => args.includes(flag))) {
|
|
68
|
-
throw new headlessNotSupportedError_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${
|
|
90
|
+
throw new headlessNotSupportedError_1.HeadlessNotSupportedError(`In WebdriverIO, use "headless=new" instead of "headless" in the "args" property of your "${optionsKey}" browser capability configuration.`);
|
|
69
91
|
}
|
|
70
92
|
(0, checkUserArgs_1.checkUserArgs)(args);
|
|
71
|
-
|
|
93
|
+
browserOpts.args = (0, mergeChromeArgs_1.default)(args, {
|
|
72
94
|
disableOtherExtensions: false,
|
|
73
95
|
disableLoadExtensionCommandFeature: true
|
|
74
96
|
});
|
package/dist/wdio/wdio.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wdio.js","sourceRoot":"","sources":["../../src/wdio/wdio.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"wdio.js","sourceRoot":"","sources":["../../src/wdio/wdio.ts"],"names":[],"mappings":"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"}
|