fix chromedriver.path

elastic · Jun 20, 2016 · 589cb71 · 589cb71
1 parent 677a6c1
commit 589cb71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/tasks/config/downloadSelenium.js b/tasks/config/downloadSelenium.js
diff --git a/tasks/config/run.js b/tasks/config/run.js
@@ -86,7 +86,7 @@ module.exports = function (grunt) {
         quiet: false,
         failOnError: false
       },
-      cmd: 'chromedriver.path',
+      cmd: chromedriver.path,
       args: [
         `--port=${uiConfig.servers.webdriver.port}`,
         '--url-base=wd/hub'
@@ -100,7 +100,7 @@ module.exports = function (grunt) {
         quiet: false,
         failOnError: false
       },
-      cmd: 'chromedriver.path',
+      cmd: chromedriver.path,
       args: [
         `--port=${uiConfig.servers.webdriver.port}`,
         '--url-base=wd/hub'

diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js
@@ -3,13 +3,16 @@ define(function (require) {
   var config = require('intern').config;
   var Promise = require('bluebird');
   var Common = require('./common');
+  var HeaderPage = require('./header_page');
 
   var defaultTimeout = config.timeouts.default;
   var common;
+  var headerPage;
 
   function settingsPage(remote) {
     this.remote = remote;
     common = new Common(this.remote);
+    headerPage = new HeaderPage(this.remote);
   }
 
   settingsPage.prototype = {
@@ -238,6 +241,9 @@ define(function (require) {
       )
       .then(function (page) {
         return page.click();
+      })
+      .then(function () {
+        return headerPage.getSpinnerDone();
       });
     },