@axe-core/cli 4.6.1-alpha.364 → 4.6.1-alpha.367

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.
Files changed (8) hide show
  1. package/dist/package.json +4 -4
  2. package/dist/src/lib/webdriver.js +5 -5
  3. package/dist/src/lib/webdriver.js.map +1 -1
  4. package/dist/src/lib/webdriver.test.js +14 -17
  5. package/dist/src/lib/webdriver.test.js.map +1 -1
  6. package/package.json +4 -4
  7. package/src/lib/webdriver.test.ts +15 -16
  8. package/src/lib/webdriver.ts +5 -5
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axe-core/cli",
3
- "version": "4.6.1-alpha.364+395d5fc",
3
+ "version": "4.6.1-alpha.367+3a38cf7",
4
4
  "description": "A CLI for accessibility testing using axe-core",
5
5
  "author": {
6
6
  "name": "Wilco Fiers",
@@ -44,12 +44,12 @@
44
44
  "testing"
45
45
  ],
46
46
  "dependencies": {
47
- "@axe-core/webdriverjs": "4.6.1-alpha.364+395d5fc",
47
+ "@axe-core/webdriverjs": "4.6.1-alpha.367+3a38cf7",
48
48
  "axe-core": "^4.6.1",
49
49
  "chromedriver": "^109.0.0",
50
50
  "colors": "^1.4.0",
51
51
  "commander": "^9.4.1",
52
- "selenium-webdriver": "4.3.0"
52
+ "selenium-webdriver": "^4.8.1"
53
53
  },
54
54
  "devDependencies": {
55
55
  "@types/chai": "^4.3.3",
@@ -87,5 +87,5 @@
87
87
  "src/testutils"
88
88
  ]
89
89
  },
90
- "gitHead": "395d5fc165c97f0c297176eb69eb58d2510c938f"
90
+ "gitHead": "3a38cf751636aa9846c77c580e21bb903b7185f6"
91
91
  }
package/dist/src/lib/webdriver.js CHANGED
@@ -22,17 +22,17 @@ const startDriver = (config) => __awaiter(void 0, void 0, void 0, function* () {
22
22
  let builder;
23
23
  /* istanbul ignore else */
24
24
  if (config.browser === 'chrome-headless') {
25
- const service = new chrome_1.default.ServiceBuilder(config.chromedriverPath || chromedriver_1.default.path).build();
26
- // Pinned to selenium-webdriver@4.3.0
27
- // https://github.com/SeleniumHQ/selenium/pull/10796/files#diff-6c87d95a2288e92e15a6bb17710c763c01c2290e679beb26220858f3218b6a62L260
28
- chrome_1.default.setDefaultService(service);
25
+ const service = new chrome_1.default.ServiceBuilder(config.chromedriverPath || chromedriver_1.default.path);
29
26
  let options = new chrome_1.default.Options().headless();
30
27
  if ((_a = config.chromeOptions) === null || _a === void 0 ? void 0 : _a.length) {
31
28
  options = config.chromeOptions.reduce(function (options, arg) {
32
29
  return options.addArguments(arg);
33
30
  }, options);
34
31
  }
35
- builder = new selenium_webdriver_1.Builder().forBrowser('chrome').setChromeOptions(options);
32
+ builder = new selenium_webdriver_1.Builder()
33
+ .forBrowser('chrome')
34
+ .setChromeOptions(options)
35
+ .setChromeService(service);
36
36
  }
37
37
  else {
38
38
  builder = new selenium_webdriver_1.Builder().forBrowser(config.browser);
package/dist/src/lib/webdriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../../src/lib/webdriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAwC;AACxC,2DAAsE;AACtE,uEAA+C;AAG/C,MAAM,WAAW,GAAG,CAClB,MAA6B,EACT,EAAE;;IACtB,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC;IACtD,IAAI,OAAgB,CAAC;IACrB,0BAA0B;IAC1B,IAAI,MAAM,CAAC,OAAO,KAAK,iBAAiB,EAAE;QACxC,MAAM,OAAO,GAAG,IAAI,gBAAM,CAAC,cAAc,CACvC,MAAM,CAAC,gBAAgB,IAAI,sBAAY,CAAC,IAAI,CAC7C,CAAC,KAAK,EAAE,CAAC;QACV,qCAAqC;QACrC,oIAAoI;QACpI,gBAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,OAAO,GAAG,IAAI,gBAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,MAAA,MAAM,CAAC,aAAa,0CAAE,MAAM,EAAE;YAChC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,OAAO,EAAE,GAAG;gBAC1D,OAAO,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC,EAAE,OAAO,CAAC,CAAC;SACb;QAED,OAAO,GAAG,IAAI,4BAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACxE;SAAM;QACL,OAAO,GAAG,IAAI,4BAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACpD;IAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC7D,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AAEO,kCAAW"}
1
+ {"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../../src/lib/webdriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAwC;AACxC,2DAAsE;AACtE,uEAA+C;AAG/C,MAAM,WAAW,GAAG,CAClB,MAA6B,EACT,EAAE;;IACtB,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC;IACtD,IAAI,OAAgB,CAAC;IACrB,0BAA0B;IAC1B,IAAI,MAAM,CAAC,OAAO,KAAK,iBAAiB,EAAE;QACxC,MAAM,OAAO,GAAG,IAAI,gBAAM,CAAC,cAAc,CACvC,MAAM,CAAC,gBAAgB,IAAI,sBAAY,CAAC,IAAI,CAC7C,CAAC;QAEF,IAAI,OAAO,GAAG,IAAI,gBAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,MAAA,MAAM,CAAC,aAAa,0CAAE,MAAM,EAAE;YAChC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,OAAO,EAAE,GAAG;gBAC1D,OAAO,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC,EAAE,OAAO,CAAC,CAAC;SACb;QAED,OAAO,GAAG,IAAI,4BAAO,EAAE;aACpB,UAAU,CAAC,QAAQ,CAAC;aACpB,gBAAgB,CAAC,OAAO,CAAC;aACzB,gBAAgB,CAAC,OAAO,CAAC,CAAC;KAC9B;SAAM;QACL,OAAO,GAAG,IAAI,4BAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACpD;IAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC7D,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AAEO,kCAAW"}
package/dist/src/lib/webdriver.test.js CHANGED
@@ -16,11 +16,11 @@ require("mocha");
16
16
  const chai_1 = require("chai");
17
17
  const webdriver_1 = require("./webdriver");
18
18
  const chromedriver_1 = __importDefault(require("chromedriver"));
19
- const chrome_1 = __importDefault(require("selenium-webdriver/chrome"));
20
19
  const path_1 = __importDefault(require("path"));
21
20
  describe('startDriver', () => {
22
21
  let config;
23
22
  let browser;
23
+ let driver;
24
24
  beforeEach(() => {
25
25
  browser = 'chrome-headless';
26
26
  config = {
@@ -30,47 +30,44 @@ describe('startDriver', () => {
30
30
  };
31
31
  });
32
32
  afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
33
- const service = chrome_1.default.getDefaultService();
34
- if (service.isRunning()) {
35
- yield service.kill();
36
- }
33
+ yield driver.quit();
37
34
  }));
38
35
  it('creates a driver', () => __awaiter(void 0, void 0, void 0, function* () {
39
- const driver = yield (0, webdriver_1.startDriver)(config);
36
+ driver = yield (0, webdriver_1.startDriver)(config);
40
37
  chai_1.assert.isObject(driver);
41
38
  chai_1.assert.isFunction(driver.manage);
42
39
  }));
43
40
  xit('sets the config.browser as the browser', () => __awaiter(void 0, void 0, void 0, function* () {
44
41
  browser = 'chrome';
45
- const driver = yield (0, webdriver_1.startDriver)(config);
42
+ driver = yield (0, webdriver_1.startDriver)(config);
46
43
  const capabilities = yield driver.getCapabilities();
47
44
  chai_1.assert.equal(capabilities.get('browserName'), browser);
48
45
  }));
49
46
  it('sets the browser as chrome with chrome-headless', () => __awaiter(void 0, void 0, void 0, function* () {
50
47
  browser = 'chrome-headless';
51
- const driver = yield (0, webdriver_1.startDriver)(config);
48
+ driver = yield (0, webdriver_1.startDriver)(config);
52
49
  const capabilities = yield driver.getCapabilities();
53
50
  chai_1.assert.equal(capabilities.get('browserName'), 'chrome');
54
51
  }));
55
52
  it('uses the chromedriver path with chrome-headless', () => __awaiter(void 0, void 0, void 0, function* () {
56
53
  browser = 'chrome-headless';
57
- yield (0, webdriver_1.startDriver)(config);
58
- const service = chrome_1.default.getDefaultService();
59
- chai_1.assert.equal(service.executable_, chromedriver_1.default.path);
54
+ driver = yield (0, webdriver_1.startDriver)(config);
55
+ const chromedriverPath = config.builder.chromeService_.exe_;
56
+ chai_1.assert.equal(chromedriverPath, chromedriver_1.default.path);
60
57
  }));
61
58
  it('uses the passed in chromedriver path with chrome-headless', () => __awaiter(void 0, void 0, void 0, function* () {
62
59
  browser = 'chrome-headless';
63
60
  config.chromedriverPath = path_1.default.relative(process.cwd(), chromedriver_1.default.path);
64
- yield (0, webdriver_1.startDriver)(config);
65
- const service = chrome_1.default.getDefaultService();
61
+ driver = yield (0, webdriver_1.startDriver)(config);
62
+ const chromedriverPath = config.builder.chromeService_.exe_;
66
63
  chai_1.assert.notEqual(config.chromedriverPath, chromedriver_1.default.path);
67
- chai_1.assert.equal(service.executable_, config.chromedriverPath);
64
+ chai_1.assert.equal(chromedriverPath, config.chromedriverPath);
68
65
  }));
69
66
  it('passes the --no-sandbox argument to chromeOptions', () => __awaiter(void 0, void 0, void 0, function* () {
70
67
  var _a;
71
68
  browser = 'chrome-headless';
72
69
  config.chromeOptions = ['--no-sandbox'];
73
- yield (0, webdriver_1.startDriver)(config);
70
+ driver = yield (0, webdriver_1.startDriver)(config);
74
71
  const options = (_a = config === null || config === void 0 ? void 0 : config.builder) === null || _a === void 0 ? void 0 : _a.getChromeOptions();
75
72
  chai_1.assert.isArray(options === null || options === void 0 ? void 0 : options.get('goog:chromeOptions').args);
76
73
  chai_1.assert.deepEqual(options === null || options === void 0 ? void 0 : options.get('goog:chromeOptions').args, [
@@ -82,7 +79,7 @@ describe('startDriver', () => {
82
79
  var _b;
83
80
  browser = 'chrome-headless';
84
81
  config.chromeOptions = ['no-sandbox', 'disable-dev-shm-usage'];
85
- yield (0, webdriver_1.startDriver)(config);
82
+ driver = yield (0, webdriver_1.startDriver)(config);
86
83
  const options = (_b = config === null || config === void 0 ? void 0 : config.builder) === null || _b === void 0 ? void 0 : _b.getChromeOptions();
87
84
  chai_1.assert.isArray(options === null || options === void 0 ? void 0 : options.get('goog:chromeOptions').args);
88
85
  chai_1.assert.deepEqual(options === null || options === void 0 ? void 0 : options.get('goog:chromeOptions').args, [
@@ -94,7 +91,7 @@ describe('startDriver', () => {
94
91
  it('sets the --timeout flag', () => __awaiter(void 0, void 0, void 0, function* () {
95
92
  browser = 'chrome-headless';
96
93
  config.timeout = 10000;
97
- const driver = yield (0, webdriver_1.startDriver)(config);
94
+ driver = yield (0, webdriver_1.startDriver)(config);
98
95
  config.builder;
99
96
  const timeoutValue = yield driver.manage().getTimeouts();
100
97
  chai_1.assert.isObject(timeoutValue);
package/dist/src/lib/webdriver.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webdriver.test.js","sourceRoot":"","sources":["../../../src/lib/webdriver.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webdriver.test.js","sourceRoot":"","sources":["../../../src/lib/webdriver.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axe-core/cli",
3
- "version": "4.6.1-alpha.364+395d5fc",
3
+ "version": "4.6.1-alpha.367+3a38cf7",
4
4
  "description": "A CLI for accessibility testing using axe-core",
5
5
  "author": {
6
6
  "name": "Wilco Fiers",
@@ -44,12 +44,12 @@
44
44
  "testing"
45
45
  ],
46
46
  "dependencies": {
47
- "@axe-core/webdriverjs": "4.6.1-alpha.364+395d5fc",
47
+ "@axe-core/webdriverjs": "4.6.1-alpha.367+3a38cf7",
48
48
  "axe-core": "^4.6.1",
49
49
  "chromedriver": "^109.0.0",
50
50
  "colors": "^1.4.0",
51
51
  "commander": "^9.4.1",
52
- "selenium-webdriver": "4.3.0"
52
+ "selenium-webdriver": "^4.8.1"
53
53
  },
54
54
  "devDependencies": {
55
55
  "@types/chai": "^4.3.3",
@@ -87,5 +87,5 @@
87
87
  "src/testutils"
88
88
  ]
89
89
  },
90
- "gitHead": "395d5fc165c97f0c297176eb69eb58d2510c938f"
90
+ "gitHead": "3a38cf751636aa9846c77c580e21bb903b7185f6"
91
91
  }
package/src/lib/webdriver.test.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import 'mocha';
2
2
  import { assert } from 'chai';
3
3
  import { startDriver } from './webdriver';
4
+ import { WebDriver } from 'selenium-webdriver';
4
5
  import chromedriver from 'chromedriver';
5
6
  import chrome from 'selenium-webdriver/chrome';
6
7
  import type { Options } from 'selenium-webdriver/chrome';
@@ -9,6 +10,7 @@ import { WebdriverConfigParams } from '../types';
9
10
  describe('startDriver', () => {
10
11
  let config: WebdriverConfigParams;
11
12
  let browser: string;
13
+ let driver: WebDriver;
12
14
  beforeEach(() => {
13
15
  browser = 'chrome-headless';
14
16
  config = {
@@ -19,28 +21,25 @@ describe('startDriver', () => {
19
21
  });
20
22
 
21
23
  afterEach(async () => {
22
- const service = chrome.getDefaultService();
23
- if (service.isRunning()) {
24
- await service.kill();
25
- }
24
+ await driver.quit();
26
25
  });
27
26
 
28
27
  it('creates a driver', async () => {
29
- const driver = await startDriver(config);
28
+ driver = await startDriver(config);
30
29
  assert.isObject(driver);
31
30
  assert.isFunction(driver.manage);
32
31
  });
33
32
 
34
33
  xit('sets the config.browser as the browser', async () => {
35
34
  browser = 'chrome';
36
- const driver = await startDriver(config);
35
+ driver = await startDriver(config);
37
36
  const capabilities = await driver.getCapabilities();
38
37
  assert.equal(capabilities.get('browserName'), browser);
39
38
  });
40
39
 
41
40
  it('sets the browser as chrome with chrome-headless', async () => {
42
41
  browser = 'chrome-headless';
43
- const driver = await startDriver(config);
42
+ driver = await startDriver(config);
44
43
  const capabilities = await driver.getCapabilities();
45
44
 
46
45
  assert.equal(capabilities.get('browserName'), 'chrome');
@@ -48,26 +47,26 @@ describe('startDriver', () => {
48
47
 
49
48
  it('uses the chromedriver path with chrome-headless', async () => {
50
49
  browser = 'chrome-headless';
51
- await startDriver(config);
52
- const service = chrome.getDefaultService();
50
+ driver = await startDriver(config);
51
+ const chromedriverPath = (config as any).builder.chromeService_.exe_;
53
52
 
54
- assert.equal((service as any).executable_, chromedriver.path);
53
+ assert.equal(chromedriverPath, chromedriver.path);
55
54
  });
56
55
 
57
56
  it('uses the passed in chromedriver path with chrome-headless', async () => {
58
57
  browser = 'chrome-headless';
59
58
  config.chromedriverPath = path.relative(process.cwd(), chromedriver.path);
60
- await startDriver(config);
61
- const service = chrome.getDefaultService();
59
+ driver = await startDriver(config);
60
+ const chromedriverPath = (config as any).builder.chromeService_.exe_;
62
61
 
63
62
  assert.notEqual(config.chromedriverPath, chromedriver.path);
64
- assert.equal((service as any).executable_, config.chromedriverPath);
63
+ assert.equal(chromedriverPath, config.chromedriverPath);
65
64
  });
66
65
 
67
66
  it('passes the --no-sandbox argument to chromeOptions', async () => {
68
67
  browser = 'chrome-headless';
69
68
  config.chromeOptions = ['--no-sandbox'];
70
- await startDriver(config);
69
+ driver = await startDriver(config);
71
70
 
72
71
  const options = config?.builder?.getChromeOptions();
73
72
  assert.isArray(options?.get('goog:chromeOptions').args);
@@ -80,7 +79,7 @@ describe('startDriver', () => {
80
79
  it('passes multiple arguments argument to chromeOptions', async () => {
81
80
  browser = 'chrome-headless';
82
81
  config.chromeOptions = ['no-sandbox', 'disable-dev-shm-usage'];
83
- await startDriver(config);
82
+ driver = await startDriver(config);
84
83
 
85
84
  const options = config?.builder?.getChromeOptions();
86
85
  assert.isArray(options?.get('goog:chromeOptions').args);
@@ -94,7 +93,7 @@ describe('startDriver', () => {
94
93
  it('sets the --timeout flag', async () => {
95
94
  browser = 'chrome-headless';
96
95
  config.timeout = 10000;
97
- const driver = await startDriver(config);
96
+ driver = await startDriver(config);
98
97
  config.builder;
99
98
  const timeoutValue = await driver.manage().getTimeouts();
100
99
 
package/src/lib/webdriver.ts CHANGED
@@ -12,10 +12,7 @@ const startDriver = async (
12
12
  if (config.browser === 'chrome-headless') {
13
13
  const service = new chrome.ServiceBuilder(
14
14
  config.chromedriverPath || chromedriver.path
15
- ).build();
16
- // Pinned to selenium-webdriver@4.3.0
17
- // https://github.com/SeleniumHQ/selenium/pull/10796/files#diff-6c87d95a2288e92e15a6bb17710c763c01c2290e679beb26220858f3218b6a62L260
18
- chrome.setDefaultService(service);
15
+ );
19
16
 
20
17
  let options = new chrome.Options().headless();
21
18
  if (config.chromeOptions?.length) {
@@ -24,7 +21,10 @@ const startDriver = async (
24
21
  }, options);
25
22
  }
26
23
 
27
- builder = new Builder().forBrowser('chrome').setChromeOptions(options);
24
+ builder = new Builder()
25
+ .forBrowser('chrome')
26
+ .setChromeOptions(options)
27
+ .setChromeService(service);
28
28
  } else {
29
29
  builder = new Builder().forBrowser(config.browser);
30
30
  }