Replace most sleeps with waitForSpinnerDone

package.json

@@ -153,6 +153,7 @@
     "auto-release-sinon": "1.0.3",
     "babel-eslint": "4.1.8",
     "chokidar": "1.4.3",
+    "chromedriver": "2.21.2",
     "elasticdump": "2.1.1",
     "eslint": "1.10.3",
     "eslint-plugin-mocha": "1.1.0",
@@ -173,7 +174,7 @@
     "html-entities": "1.1.3",
     "husky": "0.8.1",
     "image-diff": "1.6.0",
-    "intern": "3.0.1",
+    "intern": "3.1.1",
     "istanbul-instrumenter-loader": "0.1.3",
     "karma": "0.13.9",
     "karma-chrome-launcher": "0.2.0",

tasks/config/intern.js

@@ -6,6 +6,7 @@ module.exports = function (grunt) {
     options: {
       runType: 'runner',
       config: 'test/intern',
+      bail: true,
       reporters: ['Console']
     },
     dev: {},

tasks/config/run.js

@@ -6,6 +6,7 @@ module.exports = function (grunt) {
   let binScript =  /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
   let buildScript =  /^win/.test(platform) ? '.\\build\\kibana\\bin\\kibana.bat' : './build/kibana/bin/kibana';
   let uiConfig = require(root('test/server_config'));
+  let chromedriver = require('chromedriver');
 
   const stdDevArgs = [
     '--env.name=development',
@@ -113,35 +114,31 @@ module.exports = function (grunt) {
       ]
     },
 
-    seleniumServer: {
+    chromeDriver: {
       options: {
         wait: false,
-        ready: /Selenium Server is up and running/,
-        quiet: true,
+        ready: /Starting ChromeDriver/,
+        quiet: false,
         failOnError: false
       },
-      cmd: 'java',
+      cmd: chromedriver.path,
       args: [
-        '-jar',
-        '<%= downloadSelenium.options.selenium.path %>',
-        '-port',
-        uiConfig.servers.webdriver.port,
+        `--port=${uiConfig.servers.webdriver.port}`,
+        '--url-base=wd/hub',
       ]
     },
 
-    devSeleniumServer: {
+    devChromeDriver: {
       options: {
         wait: false,
-        ready: /Selenium Server is up and running/,
+        ready: /Starting ChromeDriver/,
         quiet: false,
         failOnError: false
       },
-      cmd: 'java',
+      cmd: chromedriver.path,
       args: [
-        '-jar',
-        '<%= downloadSelenium.options.selenium.path %>',
-        '-port',
-        uiConfig.servers.webdriver.port,
+        `--port=${uiConfig.servers.webdriver.port}`,
+        '--url-base=wd/hub',
       ]
     },
 

tasks/test.js

@@ -19,19 +19,17 @@ module.exports = function (grunt) {
   grunt.registerTask('test:ui', [
     'esvm:ui',
     'run:testUIServer',
-    'downloadSelenium',
-    'run:seleniumServer',
+    'run:chromeDriver',
     'intern:dev',
     'esvm_shutdown:ui',
-    'stop:seleniumServer',
+    'stop:chromeDriver',
     'stop:testUIServer'
   ]);
 
   grunt.registerTask('test:ui:server', [
     'esvm:ui',
     'run:testUIServer',
-    'downloadSelenium',
-    'run:devSeleniumServer:keepalive'
+    'run:devChromeDriver:keepalive'
   ]);
 
   grunt.registerTask('test:ui:runner', [

test/functional/apps/dashboard/_dashboard.js

@@ -65,8 +65,8 @@ bdd.describe('dashboard tab', function describeIndexTests() {
       // .then(function () {
       common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
       return headerPage.setAbsoluteRange(fromTime, toTime)
-      .then(function sleep() {
-        return common.sleep(4000);
+      .then(function () {
+        return headerPage.getSpinnerDone();
       })
       .then(function takeScreenshot() {
         common.debug('Take screenshot');

test/functional/apps/discover/_discover.js

@@ -33,6 +33,9 @@ bdd.describe('discover app', function describeIndexTests() {
     .then(function () {
       common.debug('setAbsoluteRange');
       return headerPage.setAbsoluteRange(fromTime, toTime);
+    })
+    .then(function () {
+      return headerPage.getSpinnerDone();
     });
   });
 
@@ -74,13 +77,18 @@ bdd.describe('discover app', function describeIndexTests() {
     bdd.it('load query should show query name', function () {
       return discoverPage.loadSavedSearch(queryName1)
       .then(function () {
-        return common.sleep(3000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
-        return discoverPage.getCurrentQueryName();
+        return common.try(function () {
+          return discoverPage.getCurrentQueryName()
+          .then(function (actualQueryNameString) {
+            expect(actualQueryNameString).to.be(queryName1);
+          });
+        });
       })
-      .then(function (actualQueryNameString) {
-        expect(actualQueryNameString).to.be(queryName1);
+      .then(function () {
+        return headerPage.getSpinnerDone();
       });
     });
 
@@ -101,7 +109,7 @@ bdd.describe('discover app', function describeIndexTests() {
         '61.862', '15.487', '2.362', '2.800', '15.312', '61.862', '123.2',
         '118.562', '63.524', '17.587', '2.537'
       ];
-      return common.sleep(4000)
+      return headerPage.getSpinnerDone()
       .then(function () {
         return verifyChartData(expectedBarChartData);
       });
@@ -140,7 +148,7 @@ bdd.describe('discover app', function describeIndexTests() {
       ];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(4000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -154,7 +162,7 @@ bdd.describe('discover app', function describeIndexTests() {
       ];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(4000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -166,7 +174,7 @@ bdd.describe('discover app', function describeIndexTests() {
       var expectedBarChartData = [ '66.598', '129.458'];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(2000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -179,6 +187,9 @@ bdd.describe('discover app', function describeIndexTests() {
         '133.196', '129.192', '129.724'
       ];
       return this.remote.goBack()
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      })
       .then(function () {
         return common.try(function tryingForTime() {
           return discoverPage.getChartInterval()
@@ -197,7 +208,7 @@ bdd.describe('discover app', function describeIndexTests() {
       var expectedBarChartData = [ '122.535'];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(2000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -209,7 +220,7 @@ bdd.describe('discover app', function describeIndexTests() {
       var expectedBarChartData = [ '122.535'];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(2000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -226,7 +237,7 @@ bdd.describe('discover app', function describeIndexTests() {
       ];
       return discoverPage.setChartInterval(chartInterval)
       .then(function () {
-        return common.sleep(4000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return verifyChartData(expectedBarChartData);
@@ -249,26 +260,29 @@ bdd.describe('discover app', function describeIndexTests() {
 
     function verifyChartData(expectedBarChartData) {
       return common.try(function tryingForTime() {
-        return discoverPage.getBarChartData()
-        .then(function compareData(paths) {
-          // the largest bars are over 100 pixels high so this is less than 1% tolerance
-          var barHeightTolerance = 1;
-          var stringResults = '';
-          var hasFailure = false;
-          for (var y = 0; y < expectedBarChartData.length; y++) {
-            stringResults += y + ': expected = ' + expectedBarChartData[y] + ', actual = ' + paths[y] +
-             ', Pass = ' + (Math.abs(expectedBarChartData[y] - paths[y]) < barHeightTolerance) + '\n';
-            if ((Math.abs(expectedBarChartData[y] - paths[y]) > barHeightTolerance)) {
-              hasFailure = true;
+        return headerPage.getSpinnerDone()
+        .then(function () {
+          return discoverPage.getBarChartData()
+          .then(function compareData(paths) {
+            // the largest bars are over 100 pixels high so this is less than 1% tolerance
+            var barHeightTolerance = 1;
+            var stringResults = '';
+            var hasFailure = false;
+            for (var y = 0; y < expectedBarChartData.length; y++) {
+              stringResults += y + ': expected = ' + expectedBarChartData[y] + ', actual = ' + paths[y] +
+               ', Pass = ' + (Math.abs(expectedBarChartData[y] - paths[y]) < barHeightTolerance) + '\n';
+              if ((Math.abs(expectedBarChartData[y] - paths[y]) > barHeightTolerance)) {
+                hasFailure = true;
+              };
             };
-          };
-          if (hasFailure) {
-            common.log(stringResults);
-            common.log(paths);
-          }
-          for (var x = 0; x < expectedBarChartData.length; x++) {
-            expect(Math.abs(expectedBarChartData[x] - paths[x]) < barHeightTolerance).to.be.ok();
-          }
+            if (hasFailure) {
+              common.log(stringResults);
+              common.log(paths);
+            }
+            for (var x = 0; x < expectedBarChartData.length; x++) {
+              expect(Math.abs(expectedBarChartData[x] - paths[x]) < barHeightTolerance).to.be.ok();
+            }
+          });
         });
       });
 

test/functional/apps/discover/_field_data.js

@@ -45,6 +45,9 @@ bdd.describe('discover app', function describeIndexTests() {
     bdd.it('search php should show the correct hit count', function () {
       var expectedHitCount = '445';
       return discoverPage.query('php')
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      })
       .then(function () {
         return common.try(function tryingForTime() {
           return discoverPage.getHitCount()
@@ -68,6 +71,9 @@ bdd.describe('discover app', function describeIndexTests() {
     bdd.it('search _type:apache should show the correct hit count', function () {
       var expectedHitCount = '11,156';
       return discoverPage.query('_type:apache')
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      })
       .then(function () {
         return common.try(function tryingForTime() {
           return discoverPage.getHitCount()
@@ -213,10 +219,7 @@ bdd.describe('discover app', function describeIndexTests() {
         + ' 14:26:41.000';
       return discoverPage.clickDocSortDown()
       .then(function () {
-        // we don't technically need this sleep here because the tryForTime will retry and the
-        // results will match on the 2nd or 3rd attempt, but that debug output is huge in this
-        // case and it can be avoided with just a few seconds sleep.
-        return common.sleep(2000);
+        return headerPage.getSpinnerDone();
       })
       .then(function () {
         return common.try(function tryingForTime() {

test/functional/apps/discover/_shared_links.js

@@ -44,9 +44,7 @@ bdd.describe('shared links', function describeIndexTests() {
       return headerPage.setAbsoluteRange(fromTime, toTime);
     })
     .then(function () {
-      //After hiding the time picker, we need to wait for
-      //the refresh button to hide before clicking the share button
-      return common.sleep(1000);
+      return headerPage.getSpinnerDone();
     });
   });