Merge pull request #5 from dequelabs/fix-for-release

Fix axe-cli for release

Author: marcysutton

lib/axe-test-urls.js

@@ -28,20 +28,19 @@ function testPages(urls, config, events) {
 		if (events.onTestStart) {
 			events.onTestStart(currentUrl);
 		}
-
 		driver.get(currentUrl)
 		.then(function () {
-	  	// Wait for the page to be loaded
-	  	return driver.executeAsyncScript(function(callback) {
-          var script = document.createElement('script');
-          script.innerHTML = 'document.documentElement.classList.add("deque-axe-is-ready");';
-          document.documentElement.appendChild(script);
-          callback();
-        });
-      })
-      .then(function () {
-        return driver.wait(WebDriver.until.elementsLocated(WebDriver.By.css('.deque-axe-is-ready')));
-      })
+		  	// Wait for the page to be loaded
+		  	return driver.executeAsyncScript(function(callback) {
+	          var script = document.createElement('script');
+	          script.innerHTML = 'document.documentElement.classList.add("deque-axe-is-ready");';
+	          document.documentElement.appendChild(script);
+	          callback();
+	        });
+	    })
+	    .then(function () {
+	        return driver.wait(WebDriver.until.elementsLocated(WebDriver.By.css('.deque-axe-is-ready')));
+	    })
 		.then(() => {
 			// Set everything up
 			const axe = AxeBuilder(driver, config.axeSource)
@@ -72,7 +71,7 @@ function testPages(urls, config, events) {
 				.then(out => {
 					resolve([results].concat(out))
 				});
-	    });
+		    });
 		}).catch((e) => {
 			driver.quit();
 			reject(e)

lib/webdriver.js

@@ -24,7 +24,7 @@ function startDriver(config) {
 			config.phantom = phantom;
 
 			// And connect selenium to our phantom server
-			config.driver = builder.usingServer('http://localhost:4444').build();
+			config.driver = builder.usingServer('http://localhost:4444/wd/hub').build();
 			config.driver.manage().timeouts().setScriptTimeout(90*1000)
 
 			return Promise.resolve(config);
@@ -34,7 +34,6 @@ function startDriver(config) {
 }
 
 function stopDriver(config) {
-	config.driver.quit();
 	if (config.phantom) {
 		config.phantom.kill();
 	}