From 589cb71cbbcb8343241d1654074cdaf1bb7df5dc Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Mon, 20 Jun 2016 09:25:22 -0500
Subject: [PATCH] fix chromedriver.path

---
 tasks/config/downloadSelenium.js    | 15 ---------------
 tasks/config/run.js                 |  4 ++--
 test/support/pages/settings_page.js |  6 ++++++
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 tasks/config/downloadSelenium.js

diff --git a/tasks/config/downloadSelenium.js b/tasks/config/downloadSelenium.js
deleted file mode 100644
index d337d89ba7740..0000000000000
--- a/tasks/config/downloadSelenium.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var path = require('path');
-
-
-module.exports = function (grunt) {
-  return {
-    options: {
-      selenium: {
-        filename: 'selenium-server-standalone-2.53.0.jar',
-        server: 'https://selenium-release.storage.googleapis.com/2.53/',
-        md5: '774efe2d84987fb679f2dea038c2fa32',
-        directory: path.join(grunt.config.get('root'), 'selenium')
-      }
-    }
-  };
-};
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 08bd12a356303..dc7f2e0062db9 100644
--- 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
index 871d7081a9d35..5877a4902eb84 100644
--- 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();
       });
     },