Skip to content

Commit

Permalink
Fix setFindTimeout defaults to 10 seconds.
Browse files Browse the repository at this point in the history
  • Loading branch information
LeeDr committed Apr 27, 2016
1 parent 855faff commit d97b4bc
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions test/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ define(function (require) {
}
},
timeouts: {
// this is how long a test can run before timing out
default: 90000
default: 90000, // this is how long a test can run before timing out
findTimeout: 10000 // this is how long we try to find elements on page
},
}, serverConfig);
});
2 changes: 1 addition & 1 deletion test/support/pages/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ define(function (require) {
}


var defaultTimeout = config.timeouts.default;
var defaultTimeout = config.timeouts.findTimeout;

Common.prototype = {
constructor: Common,
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/discover_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ define(function (require) {
var config = require('intern').config;
var Common = require('./common');

var defaultTimeout = config.timeouts.default;
var defaultTimeout = config.timeouts.findTimeout;
var common;
var thisTime;

Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/header_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define(function (require) {
common = new Common(this.remote);
}

var defaultTimeout = config.timeouts.default;
var defaultTimeout = config.timeouts.findTimeout;

HeaderPage.prototype = {
constructor: HeaderPage,
Expand Down
5 changes: 3 additions & 2 deletions test/support/pages/settings_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define(function (require) {
var Promise = require('bluebird');
var Common = require('./common');

var defaultTimeout = config.timeouts.default;
var defaultTimeout = config.timeouts.findTimeout;
var common;

function settingsPage(remote) {
Expand Down Expand Up @@ -40,7 +40,8 @@ define(function (require) {
return common.sleep(1000);
})
.then(function setAdvancedSettingsClickPropertyValue(selectList) {
return self.remote.findByCssSelector('option[label="' + propertyValue + '"]')
return self.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('option[label="' + propertyValue + '"]')
.click();
})
.then(function setAdvancedSettingsClickSaveButton() {
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/visualize_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define(function (require) {
var registerSuite = require('intern!object');
var Common = require('./common');

var defaultTimeout = config.timeouts.default;
var defaultTimeout = config.timeouts.findTimeout;
var common;

function VisualizePage(remote) {
Expand Down

0 comments on commit d97b4bc

Please sign in to comment.