@axe-core/watcher 3.21.1 → 3.22.0-next.3037b5a3
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/Controller.d.ts +2 -0
- package/dist/Controller.js +5 -0
- package/dist/Controller.js.map +1 -1
- package/dist/cypress/cypress.d.ts +12 -2
- package/dist/cypress/cypress.js +100 -67
- package/dist/cypress/cypress.js.map +1 -1
- package/dist/cypressCommands.js +20 -3
- package/dist/cypressCommands.js.map +1 -1
- package/dist/playwright/playwright.d.ts +1 -0
- package/dist/playwright/playwright.js +18 -0
- package/dist/playwright/playwright.js.map +1 -1
- package/dist/puppeteer/puppeteer.d.ts +1 -0
- package/dist/puppeteer/puppeteer.js +19 -0
- package/dist/puppeteer/puppeteer.js.map +1 -1
- package/dist/sendResultsToServer.d.ts +2 -1
- package/dist/sendResultsToServer.js +128 -46
- package/dist/sendResultsToServer.js.map +1 -1
- package/dist/utils/createAbortController.d.ts +11 -0
- package/dist/utils/createAbortController.js +14 -0
- package/dist/utils/createAbortController.js.map +1 -0
- package/dist/utils/handleNoSupportForChromeLoadExtensions.d.ts +9 -0
- package/dist/utils/handleNoSupportForChromeLoadExtensions.js +16 -0
- package/dist/utils/handleNoSupportForChromeLoadExtensions.js.map +1 -0
- package/dist/utils/types.d.ts +3 -0
- package/dist/utils/types.js +3 -0
- package/dist/utils/types.js.map +1 -0
- package/dist/utils/writeVariables.d.ts +11 -0
- package/dist/utils/writeVariables.js.map +1 -1
- package/dist/wdio/wdio.d.ts +1 -0
- package/dist/wdio/wdio.js +9 -0
- package/dist/wdio/wdio.js.map +1 -1
- package/dist/webdriver/webdriver.d.ts +1 -0
- package/dist/webdriver/webdriver.js +20 -0
- package/dist/webdriver/webdriver.js.map +1 -1
- package/extension/background.js +1 -1
- package/extension/content.js +1 -1
- package/package.json +8 -3
@@ -1,16 +1,51 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
37
|
};
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
39
|
exports.sendResultsToServer = exports.MAX_RETRIES = exports.MAX_PAGE_STATES_PER_REQUEST = void 0;
|
7
|
-
const node_fetch_1 =
|
40
|
+
const node_fetch_1 = __importStar(require("node-fetch"));
|
8
41
|
const uuid_1 = require("uuid");
|
9
42
|
const readVariables_1 = __importDefault(require("./utils/readVariables"));
|
10
43
|
const linearBackoff_1 = __importDefault(require("./utils/linearBackoff"));
|
44
|
+
const createAbortController_1 = __importStar(require("./utils/createAbortController"));
|
11
45
|
const { version } = require('../package.json');
|
12
46
|
exports.MAX_PAGE_STATES_PER_REQUEST = 5;
|
13
47
|
exports.MAX_RETRIES = 3;
|
48
|
+
const MAX_RETRIES_ERROR_TYPE = 'maximum-retries';
|
14
49
|
const sendResultsToServer = async ({ results, debugLogger }) => {
|
15
50
|
const { server_url, api_key, session_id, git_data } = (0, readVariables_1.default)();
|
16
51
|
const resultsURL = new URL(`/api-pub/watcher/sessions/${session_id}`, server_url);
|
@@ -26,53 +61,90 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
26
61
|
results: bodyResults,
|
27
62
|
...git_data
|
28
63
|
};
|
29
|
-
const
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
batchResults: bodyResults.length,
|
41
|
-
reqSize: Buffer.byteLength(JSON.stringify(body)),
|
42
|
-
resStatus: res.status,
|
43
|
-
resStatusText: res.statusText
|
44
|
-
});
|
45
|
-
console.warn('@axe-core/watcher: Unable to send results to server');
|
46
|
-
}
|
47
|
-
else {
|
48
|
-
debugLogger('SendResultsToServer: Successfully sent', {
|
49
|
-
batchResults: bodyResults.length,
|
50
|
-
reqSize: Buffer.byteLength(JSON.stringify(body)),
|
51
|
-
resStatus: res.status,
|
52
|
-
resStatusText: res.statusText
|
64
|
+
const { signal, cleanup } = (0, createAbortController_1.default)();
|
65
|
+
try {
|
66
|
+
const res = await (0, node_fetch_1.default)(resultsURL, {
|
67
|
+
method: 'PUT',
|
68
|
+
redirect: 'follow',
|
69
|
+
headers: {
|
70
|
+
'Content-Type': 'application/json',
|
71
|
+
'X-API-Key': api_key
|
72
|
+
},
|
73
|
+
body: JSON.stringify(body),
|
74
|
+
signal
|
53
75
|
});
|
76
|
+
if (!res.ok) {
|
77
|
+
debugLogger('SendResultsToServer: Failed to send results', {
|
78
|
+
batchResults: bodyResults.length,
|
79
|
+
reqSize: Buffer.byteLength(JSON.stringify(body)),
|
80
|
+
resStatus: res.status,
|
81
|
+
resStatusText: res.statusText
|
82
|
+
});
|
83
|
+
console.warn('@axe-core/watcher: Unable to send results to server');
|
84
|
+
}
|
85
|
+
else {
|
86
|
+
debugLogger('SendResultsToServer: Successfully sent', {
|
87
|
+
batchResults: bodyResults.length,
|
88
|
+
reqSize: Buffer.byteLength(JSON.stringify(body)),
|
89
|
+
resStatus: res.status,
|
90
|
+
resStatusText: res.statusText
|
91
|
+
});
|
92
|
+
}
|
93
|
+
const is500 = res.status === 500;
|
94
|
+
const is408 = res.status === 408;
|
95
|
+
const is429 = res.status === 429;
|
96
|
+
if ((is500 || is408 || is429) && retryAttempt !== exports.MAX_RETRIES) {
|
97
|
+
const incrementRetry = retryAttempt + 1;
|
98
|
+
console.warn('@axe-core/watcher: Retrying...');
|
99
|
+
debugLogger('SendResultsToServer: Retrying...', {
|
100
|
+
retryAttempt: incrementRetry,
|
101
|
+
resStatus: res.status,
|
102
|
+
batchResults: bodyResults.length,
|
103
|
+
reqSize: Buffer.byteLength(JSON.stringify(body))
|
104
|
+
});
|
105
|
+
await (0, linearBackoff_1.default)(incrementRetry);
|
106
|
+
await putResults(bodyResults, incrementRetry);
|
107
|
+
}
|
108
|
+
else if (retryAttempt === exports.MAX_RETRIES && !res.ok) {
|
109
|
+
debugLogger('SendResultsToServer: Max retries reached', {
|
110
|
+
retryAttempt,
|
111
|
+
resStatus: res.status
|
112
|
+
});
|
113
|
+
console.warn('@axe-core/watcher: Unable to send results to server, max retries reached');
|
114
|
+
return Promise.reject(new node_fetch_1.FetchError('Maximum retries reached', MAX_RETRIES_ERROR_TYPE));
|
115
|
+
}
|
54
116
|
}
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
117
|
+
catch (error) {
|
118
|
+
if (error.name === 'AbortError') {
|
119
|
+
debugLogger('SendResultsToServer: Aborted request due to timeout', {
|
120
|
+
abortTimeout: createAbortController_1.ABORT_CONTROLLER_TIMEOUT,
|
121
|
+
retryAttempt,
|
122
|
+
batchResults: bodyResults.length,
|
123
|
+
reqSize: Buffer.byteLength(JSON.stringify(body))
|
124
|
+
});
|
125
|
+
if (retryAttempt !== exports.MAX_RETRIES) {
|
126
|
+
const incrementRetry = retryAttempt + 1;
|
127
|
+
console.warn('@axe-core/watcher: Retrying after timeout...');
|
128
|
+
debugLogger('SendResultsToServer: Retrying after timeout...', {
|
129
|
+
retryAttempt: incrementRetry,
|
130
|
+
batchResults: bodyResults.length,
|
131
|
+
reqSize: Buffer.byteLength(JSON.stringify(body))
|
132
|
+
});
|
133
|
+
await (0, linearBackoff_1.default)(incrementRetry);
|
134
|
+
await putResults(bodyResults, incrementRetry);
|
135
|
+
}
|
136
|
+
else {
|
137
|
+
debugLogger('SendResultsToServer: Max retries reached after timeout', {
|
138
|
+
retryAttempt
|
139
|
+
});
|
140
|
+
console.warn('@axe-core/watcher: Request timed out, max retries reached');
|
141
|
+
return Promise.reject(new node_fetch_1.FetchError('Request timed out, maximum retries reached', MAX_RETRIES_ERROR_TYPE));
|
142
|
+
}
|
143
|
+
}
|
144
|
+
throw error;
|
69
145
|
}
|
70
|
-
|
71
|
-
|
72
|
-
retryAttempt,
|
73
|
-
resStatus: res.status
|
74
|
-
});
|
75
|
-
console.warn('@axe-core/watcher: Unable to send results to server, max retries reached');
|
146
|
+
finally {
|
147
|
+
cleanup();
|
76
148
|
}
|
77
149
|
};
|
78
150
|
results.forEach(result => {
|
@@ -81,6 +153,9 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
81
153
|
}
|
82
154
|
});
|
83
155
|
const requestErrorHandler = (error) => {
|
156
|
+
if (error.type === MAX_RETRIES_ERROR_TYPE) {
|
157
|
+
return { failureStatus: error.message };
|
158
|
+
}
|
84
159
|
debugLogger('SendResultsToServer: Fetch error', {
|
85
160
|
message: error.message,
|
86
161
|
type: error.type || 'NA',
|
@@ -89,11 +164,18 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
|
|
89
164
|
errno: error.errno || 'NA'
|
90
165
|
});
|
91
166
|
};
|
167
|
+
let catchResult;
|
92
168
|
for (let i = 0; i < results.length; i += exports.MAX_PAGE_STATES_PER_REQUEST) {
|
93
169
|
const batch = results
|
94
170
|
.slice(i, i + exports.MAX_PAGE_STATES_PER_REQUEST)
|
95
171
|
.map(r => ({ ...r, screenshot: null }));
|
96
|
-
await putResults(batch).catch(requestErrorHandler);
|
172
|
+
catchResult = await putResults(batch).catch(requestErrorHandler);
|
173
|
+
if (catchResult) {
|
174
|
+
break;
|
175
|
+
}
|
176
|
+
}
|
177
|
+
if (catchResult) {
|
178
|
+
return Promise.resolve(catchResult);
|
97
179
|
}
|
98
180
|
await Promise.all(results.map(async ({ screenshot, screenshot_id }) => {
|
99
181
|
if (!screenshot) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,11 @@
|
|
1
|
+
/**
|
2
|
+
* The timeout for the AbortController, in milliseconds.
|
3
|
+
* If the request takes longer than this, it will be aborted.
|
4
|
+
*/
|
5
|
+
export declare const ABORT_CONTROLLER_TIMEOUT = 10000;
|
6
|
+
interface CreateAbortControllerReturn {
|
7
|
+
signal: AbortSignal;
|
8
|
+
cleanup: () => void;
|
9
|
+
}
|
10
|
+
declare function createAbortController(): CreateAbortControllerReturn;
|
11
|
+
export default createAbortController;
|
@@ -0,0 +1,14 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.ABORT_CONTROLLER_TIMEOUT = void 0;
|
4
|
+
exports.ABORT_CONTROLLER_TIMEOUT = 10000;
|
5
|
+
function createAbortController() {
|
6
|
+
const abortController = new AbortController();
|
7
|
+
const timeoutId = setTimeout(() => abortController.abort(), exports.ABORT_CONTROLLER_TIMEOUT);
|
8
|
+
return {
|
9
|
+
signal: abortController.signal,
|
10
|
+
cleanup: () => clearTimeout(timeoutId)
|
11
|
+
};
|
12
|
+
}
|
13
|
+
exports.default = createAbortController;
|
14
|
+
//# sourceMappingURL=createAbortController.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"createAbortController.js","sourceRoot":"","sources":["../../src/utils/createAbortController.ts"],"names":[],"mappings":";;;AAIa,QAAA,wBAAwB,GAAG,KAAK,CAAA;AAO7C,SAAS,qBAAqB;IAC5B,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,SAAS,GAAG,UAAU,CAC1B,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAC7B,gCAAwB,CACzB,CAAA;IAED,OAAO;QACL,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC;KACvC,CAAA;AACH,CAAC;AAED,kBAAe,qBAAqB,CAAA"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
/**
|
2
|
+
* Checks the Chrome version and informs users that `--load-extensions` flag is no longer supported.
|
3
|
+
* For Chrome versions 139 and higher we are throwing an error since the load extensions flag is completely removed,
|
4
|
+
* see https://groups.google.com/a/chromium.org/g/chromium-extensions/c/1-g8EFx2BBY/m/S0ET5wPjCAAJ
|
5
|
+
* @param browserName - The name of the browser.
|
6
|
+
* @param browserVersion - The version of the browser.
|
7
|
+
*/
|
8
|
+
declare function handleNoSupportForChromeLoadExtensions(browserName: string, browserVersion: number): void;
|
9
|
+
export default handleNoSupportForChromeLoadExtensions;
|
@@ -0,0 +1,16 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
function handleNoSupportForChromeLoadExtensions(browserName, browserVersion) {
|
4
|
+
if (browserName.toLowerCase() === 'chrome' && !isNaN(browserVersion)) {
|
5
|
+
const CHROME_VERSION_NO_EXTENSIONS = 139;
|
6
|
+
const chromeSupportMessage = `Branded versions of Google Chrome v${CHROME_VERSION_NO_EXTENSIONS} and higher removed support for tools like @axe-core/watcher. Use Chrome for Testing or Chromium instead. Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements`;
|
7
|
+
if (browserVersion >= CHROME_VERSION_NO_EXTENSIONS) {
|
8
|
+
throw new Error(chromeSupportMessage);
|
9
|
+
}
|
10
|
+
else {
|
11
|
+
console.warn('Warning: ' + chromeSupportMessage);
|
12
|
+
}
|
13
|
+
}
|
14
|
+
}
|
15
|
+
exports.default = handleNoSupportForChromeLoadExtensions;
|
16
|
+
//# sourceMappingURL=handleNoSupportForChromeLoadExtensions.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"handleNoSupportForChromeLoadExtensions.js","sourceRoot":"","sources":["../../src/utils/handleNoSupportForChromeLoadExtensions.ts"],"names":[],"mappings":";;AAOA,SAAS,sCAAsC,CAC7C,WAAmB,EACnB,cAAsB;IAEtB,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QACrE,MAAM,4BAA4B,GAAG,GAAG,CAAA;QACxC,MAAM,oBAAoB,GAAG,sCAAsC,4BAA4B,0OAA0O,CAAA;QACzU,IAAI,cAAc,IAAI,4BAA4B,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;aAAM,CAAC;YAEN,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,oBAAoB,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;AACH,CAAC;AAED,kBAAe,sCAAsC,CAAA"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":""}
|
@@ -105,6 +105,17 @@ interface AxeConfiguration {
|
|
105
105
|
*/
|
106
106
|
configurationOverrides?: ConfigurationOverrides;
|
107
107
|
}
|
108
|
+
export type CypressTestingType = 'e2e' | 'component';
|
109
|
+
export interface CypressAxeConfiguration extends AxeConfiguration {
|
110
|
+
/**
|
111
|
+
* Which Cypress Testing Type(s) (e2e or component) to enable @axe-core/watcher for.
|
112
|
+
* Default: 'e2e'
|
113
|
+
*/
|
114
|
+
testingTypes?: CypressTestingType | CypressTestingType[];
|
115
|
+
}
|
116
|
+
export interface CypressConfiguration {
|
117
|
+
axe: CypressAxeConfiguration;
|
118
|
+
}
|
108
119
|
export interface Configuration {
|
109
120
|
axe: AxeConfiguration;
|
110
121
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAA6B;AAC7B,4CAAmB;AACnB,2CAAgD;AAChD,mDAGwB;AACxB,mEAAgF;AAChF,uEAA8C;AAC9C,4EAA6E;AAC7E,mEAA+D;AAC/D,oFAA2D;AAC3D,sFAAoD;AAEpD,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,uBAAuB,CAAC,CAAA;AAI3D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AA4BjD,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;CACb,CAAA;
|
1
|
+
{"version":3,"file":"writeVariables.js","sourceRoot":"","sources":["../../src/utils/writeVariables.ts"],"names":[],"mappings":"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"}
|
package/dist/wdio/wdio.d.ts
CHANGED
@@ -18,6 +18,7 @@ export declare function wdioTestRunner({ axe, ...config }: WebdriverIO.Config &
|
|
18
18
|
export declare class WdioController extends Controller {
|
19
19
|
private driver;
|
20
20
|
constructor(driver: Browser);
|
21
|
+
protected checkBrowserCompatibility(): Promise<void>;
|
21
22
|
protected executeScript<T>(fn: string | (() => Promise<T>), ...args: unknown[]): Promise<T>;
|
22
23
|
}
|
23
24
|
/** Webdriver `browser` methods. */
|
package/dist/wdio/wdio.js
CHANGED
@@ -14,6 +14,7 @@ const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError"
|
|
14
14
|
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
15
15
|
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
16
16
|
const writeSessionFile_1 = __importDefault(require("../utils/writeSessionFile"));
|
17
|
+
const handleNoSupportForChromeLoadExtensions_1 = __importDefault(require("../utils/handleNoSupportForChromeLoadExtensions"));
|
17
18
|
const noop = () => {
|
18
19
|
};
|
19
20
|
function wdioConfig({ axe, ...options }) {
|
@@ -94,6 +95,14 @@ class WdioController extends Controller_1.default {
|
|
94
95
|
});
|
95
96
|
this.driver = driver;
|
96
97
|
}
|
98
|
+
checkBrowserCompatibility() {
|
99
|
+
const browserMajorVersion = Number(this.driver.capabilities?.browserVersion?.split('.')[0]);
|
100
|
+
const browserName = this.driver.capabilities?.browserName;
|
101
|
+
if (browserMajorVersion && browserName) {
|
102
|
+
(0, handleNoSupportForChromeLoadExtensions_1.default)(browserName, browserMajorVersion);
|
103
|
+
}
|
104
|
+
return Promise.resolve();
|
105
|
+
}
|
97
106
|
async executeScript(fn, ...args) {
|
98
107
|
const script = `
|
99
108
|
const callback = arguments[arguments.length - 1];
|
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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"}
|
@@ -15,5 +15,6 @@ export declare function webdriverConfig(arg: WebDriverArgs): Options;
|
|
15
15
|
export declare class WebdriverController extends Controller {
|
16
16
|
private driver;
|
17
17
|
constructor(driver: WebDriver);
|
18
|
+
protected checkBrowserCompatibility(): Promise<void>;
|
18
19
|
protected executeScript<T>(fn: string | (() => Promise<T>), ...args: unknown[]): Promise<T>;
|
19
20
|
}
|
@@ -10,6 +10,7 @@ const writeVariables_1 = __importDefault(require("../utils/writeVariables"));
|
|
10
10
|
const headlessNotSupportedError_1 = require("../utils/headlessNotSupportedError");
|
11
11
|
const mergeChromeArgs_1 = __importDefault(require("../utils/mergeChromeArgs"));
|
12
12
|
const checkUserArgs_1 = require("../utils/checkUserArgs");
|
13
|
+
const handleNoSupportForChromeLoadExtensions_1 = __importDefault(require("../utils/handleNoSupportForChromeLoadExtensions"));
|
13
14
|
var webdriverWrapping_1 = require("./webdriverWrapping");
|
14
15
|
Object.defineProperty(exports, "wrapWebdriver", { enumerable: true, get: function () { return webdriverWrapping_1.wrapDriver; } });
|
15
16
|
function webdriverConfig(arg) {
|
@@ -37,6 +38,25 @@ class WebdriverController extends Controller_1.default {
|
|
37
38
|
});
|
38
39
|
this.driver = driver;
|
39
40
|
}
|
41
|
+
async checkBrowserCompatibility() {
|
42
|
+
let capabilities;
|
43
|
+
let browserMajorVersion;
|
44
|
+
let browserName;
|
45
|
+
try {
|
46
|
+
capabilities = await this.driver.getCapabilities();
|
47
|
+
if (!capabilities) {
|
48
|
+
return;
|
49
|
+
}
|
50
|
+
browserMajorVersion = Number(capabilities.get('browserVersion')?.split('.')[0]);
|
51
|
+
browserName = capabilities.get('browserName');
|
52
|
+
}
|
53
|
+
catch (error) {
|
54
|
+
console.warn('Unable to determine browser. ' + error.message);
|
55
|
+
}
|
56
|
+
if (browserMajorVersion && browserName) {
|
57
|
+
(0, handleNoSupportForChromeLoadExtensions_1.default)(browserName, browserMajorVersion);
|
58
|
+
}
|
59
|
+
}
|
40
60
|
async executeScript(fn, ...args) {
|
41
61
|
const script = `
|
42
62
|
const callback = arguments[arguments.length - 1];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/webdriver/webdriver.ts"],"names":[],"mappings":";;;;;;
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/webdriver/webdriver.ts"],"names":[],"mappings":";;;;;;AAqBA,0CA+BC;AAlDD,+DAAsC;AACtC,6EAA4E;AAC5E,kFAA8E;AAC9E,+EAAsD;AACtD,0DAAsD;AACtD,6HAAoG;AAEpG,yDAAiE;AAAxD,kHAAA,UAAU,OAAiB;AAYpC,SAAgB,eAAe,CAAC,GAAkB;IAGhD,MAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;IAEnD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;IAC5B,IAAA,wBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,MAAM,IAAI,GAAY,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAA;IAE9D,MAAM,YAAY,GAAG,CAAE,IAAY,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAa,CAAA;IACtE,IAAA,6BAAa,EAAC,YAAY,CAAC,CAE1B;IAAC,IAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAA,yBAAe,EAAC,YAAY,EAAE;QAC3D,sBAAsB,EAAE,KAAK;QAC7B,kCAAkC,EAAE,IAAI;KACzC,CAAC,CAAA;IAGF,IACE,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAEpC,IAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAC9C,EACD,CAAC;QACD,MAAM,IAAI,qDAAyB,CACjC,wIAAwI,CACzI,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAiB;QAC3B,KAAK,CAAC;YACJ,eAAe,EAAE,qBAAqB;YACtC,eAAe,EAAE,WAAW;YAC5B,qBAAqB,EAAE,mBAAmB;SAC3C,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,yBAAyB;QACvC,IAAI,YAAY,CAAA;QAChB,IAAI,mBAAmB,CAAA;QACvB,IAAI,WAAW,CAAA;QAEf,IAAI,CAAC;YACH,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAA;YAClD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAM;YACR,CAAC;YAED,mBAAmB,GAAG,MAAM,CAC1B,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAClD,CAAA;YACD,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,OAAO,CAAC,IAAI,CAAC,+BAA+B,GAAI,KAAe,CAAC,OAAO,CAAC,CAAA;QAC1E,CAAC;QAED,IAAI,mBAAmB,IAAI,WAAW,EAAE,CAAC;YACvC,IAAA,gDAAsC,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAA;QAC1E,CAAC;IACH,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,MAAM,GAAG;;;gBAGH,EAAE;;KAEb,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;QACpE,OAAO,MAAW,CAAA;IACpB,CAAC;CACF;AAnDD,kDAmDC"}
|