fix(cli): start webdriver correctly (#69)

dequelabs · Aug 17, 2020 · 90675b4 · 90675b4
1 parent 02beb41
commit 90675b4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/packages/cli/lib/axe-test-urls.js b/packages/cli/lib/axe-test-urls.js
@@ -3,15 +3,15 @@
 const WebDriver = require('selenium-webdriver');
 const AxeBuilder = require('@axe-core/webdriverjs');
 
-function testPages(urls, config, events) {
-  const driver = config.driver;
-
+async function testPages(urls, config, events) {
+  //selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/index_exports_ThenableWebDriver.html
+  // We tried to use the non-thenable webdriver and failed the unit test for startDriver() even after we tried to make it work
+  const driver = await config.driver;
   // End of the line, no more page left
   if (urls.length === 0) {
     driver.quit();
     return Promise.resolve([]);
   }
-
   return new Promise((resolve, reject) => {
     // Grab the first item on the URL list
     const currentUrl = urls[0].replace(/[,;]$/, '');

diff --git a/packages/cli/lib/webdriver.js b/packages/cli/lib/webdriver.js
@@ -27,11 +27,10 @@ async function startDriver(config) {
     builder = new Builder().forBrowser(config.browser);
   }
   // Launch a browser
-  config.driver = builder.build();
   config.builder = builder;
-
-  await config.driver.manage().setTimeouts({ script: scriptTimeout })
-  return config.driver;
+  const driver = builder.build();
+  await driver.manage().setTimeouts({ script: scriptTimeout })
+  return driver;
 }
 
 module.exports = {

diff --git a/packages/cli/test/integrations.js b/packages/cli/test/integrations.js
@@ -31,7 +31,7 @@ describe('integrations', function () {
     program = {
       browser: 'chrome-headless'
     };
-    await startDriver(program);
+    program.driver = await startDriver(program);
     urls = ['http://localhost:8182/test/testpage.html'];
   });
 

diff --git a/packages/cli/test/webdriver.js b/packages/cli/test/webdriver.js
@@ -31,10 +31,10 @@ describe('startDriver', () => {
   });
 
   it('creates a driver', async () => {
-    await startDriver(config);
+    const driver = await startDriver(config);
 
-    assert.isObject(config.driver);
-    assert.isFunction(config.driver.manage);
+    assert.isObject(driver);
+    assert.isFunction(driver.manage);
   });
 
   xit('sets the config.browser as the browser', done => {
@@ -49,8 +49,8 @@ describe('startDriver', () => {
 
   it('sets the browser as chrome with chrome-headless', async () => {
     browser = 'chrome-headless';
-    await startDriver(config);
-    const capabilities = await config.driver.getCapabilities();
+    const driver = await startDriver(config);
+    const capabilities = await driver.getCapabilities();
 
     assert.equal(capabilities.get('browserName'), 'chrome');
   });
@@ -97,9 +97,9 @@ describe('startDriver', () => {
   it('sets the --timeout flag', async () => {
     browser = 'chrome-headless';
     config.timeout = 10000;
-    await startDriver(config);
+    const driver = await startDriver(config);
     await config.builder;
-    const timeoutValue = await config.driver.manage().getTimeouts();
+    const timeoutValue = await driver.manage().getTimeouts();
 
     assert.isObject(timeoutValue);
     assert.deepEqual(timeoutValue.script, 10000000);