diff --git a/tasks/travis.js b/tasks/travis.js index 3427830557bd..a034818f0f3e 100644 --- a/tasks/travis.js +++ b/tasks/travis.js @@ -1,8 +1,9 @@ module.exports = function (grunt) { grunt.registerTask('travis', 'Travis CI build script', [ - 'test:browser', - 'test:server' + 'eslint:source', + 'test:server', + 'test:browser' ]); }; diff --git a/test/functional/apps/visualize/index.js b/test/functional/apps/visualize/index.js index bdc746a5b6d8..8369c5d3249e 100644 --- a/test/functional/apps/visualize/index.js +++ b/test/functional/apps/visualize/index.js @@ -39,19 +39,9 @@ define(function (require) { bdd.before(function () { var self = this; remote.setWindowSize(1200,800); - remote.setTimeout('script', 5 * 60 * 1000); - remote.setTimeout('implicit', 5 * 60 * 1000); - remote.setTimeout('page load', 5 * 60 * 1000); - - remote.getTimeout('page load') //One of 'script', 'implicit', or 'page load'. (ms) - .then(function (timeout) { // defaults 0, 0, Infinity - common.debug(timeout); - }) - .then(function () { // load a set of makelogs data - common.debug('loadIfEmpty logstashFunctional ' + self.timeout); - return scenarioManager.loadIfEmpty('logstashFunctional'); - }); + common.debug('loadIfEmpty logstashFunctional ' + self.timeout); + return scenarioManager.loadIfEmpty('logstashFunctional'); });