github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

unify timeouts, make timeout larger, remove debugging code

Browse source
This commit is contained in:
Joe Fleming 2015-11-11 11:28:56 -07:00
parent fd2d4435f1
commit 7b5dd3ef9c
2 changed files with 10 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/support/pages/Common.js
View file

@ -94,10 +94,8 @@ define(function (require) {
getApp: function () {
var self = this;
return Promise.try(function () {
return self.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('.content > .application');
})
return self.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('.content > .application')
.then(function () {
return self.runScript(function () {
var $ = window.$;

58
test/support/pages/SettingsPage.js
View file

@ -7,7 +7,7 @@ define(function (require) {
var Promise = require('bluebird');
var Common = require('./Common');
var defaultTimeout = 30000;
var defaultTimeout = 60000;
var common;
function SettingsPage(remote) {
@ -46,35 +46,18 @@ define(function (require) {
selectTimeFieldOption: function (selection) {
var self = this;
return common.tryForTime(defaultTimeout * 2, function () {
return self.getTimeFieldNameField().click();
})
return self.getTimeFieldNameField().click()
.then(function () {
return self.getTimeFieldNameField().click();
return self.getTimeFieldNameField().click()
})
.then(function () {
return self.getTimeFieldOption(selection);
})
// DEBUGGING
.catch(function (err) {
common.debug('selectTimeFieldOption: FAILED to create index pattern');
return common.checkForKibanaApp()
.then(function (onKibana) {
common.debug('onKibana')
common.debug(onKibana)
})
.then(function () {
return self.remote.getCurrentUrl();
})
.then(function (url) {
common.debug('FAILED on url ' + url);
throw err
})
});
},
getTimeFieldOption: function (selection) {
return this.remote.setFindTimeout(defaultTimeout * 2)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('option[label="' + selection + '"]').click();
},
@ -143,17 +126,8 @@ define(function (require) {
var self = this;
var selector = 'li.kbn-settings-tab.active a small';
var getText = function () {
return self.remote.setFindTimeout(defaultTimeout)
.findByCssSelector(selector).getVisibleText();
}
return common.tryForTime(defaultTimeout * 4, function () {
return getText();
})
.then(function () {
return getText();
})
return self.remote.setFindTimeout(defaultTimeout)
.findByCssSelector(selector).getVisibleText()
.then(function (theText) {
// the value has () around it, remove them
return theText.replace(/\((.*)\)/, '$1');
@ -212,7 +186,7 @@ define(function (require) {
},
openControlsByName: function (name) {
return this.remote.setFindTimeout(defaultTimeout * 2)
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('div.actions a.btn.btn-xs.btn-default[href$="/' + name + '"]')
.then(function (button) {
return button.click();
@ -277,22 +251,6 @@ define(function (require) {
}
});
});
})
// DEBUGGING
.catch(function (err) {
common.debug('createIndexPattern: FAILED to create index pattern');
return common.checkForKibanaApp()
.then(function (onKibana) {
common.debug('onKibana')
common.debug(onKibana)
})
.then(function () {
return self.remote.getCurrentUrl();
})
.then(function (url) {
common.debug('FAILED on url ' + url);
throw err
})
});
},