Skip to content

Commit

Permalink
Fix page timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
schipiga committed Apr 2, 2018
1 parent bbbe2cc commit 584f8fa
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 30 deletions.
1 change: 1 addition & 0 deletions lib/config.js
Expand Up @@ -24,6 +24,7 @@ config.webdriver = U.defVal(config.webdriver, {});

config.web = U.defVal(config.web, {});
config.web.uiTimeout = 5;
config.web.pageTimeout = 60;
config.web.use = U.defVal(!!args.web, false);
config.web.url = U.defVal(args.webUrl);
config.web.updateDrivers = U.defVal(args.updateWebDrivers, false);
Expand Down
6 changes: 3 additions & 3 deletions lib/steps/browser.js
Expand Up @@ -330,18 +330,18 @@ var BrowserSteps = {
* @memberOf BrowserSteps
* @method openUrl
* @instance
* @arg {string} pageUrl - URL which should be opened in browser.
* @arg {string} webUrl - URL which should be opened in browser.
* @arg {object} [opts] - Step options.
* @arg {boolean} [opts.check=true] - Flag to check that URL is opened.
* @arg {number} [opts.timeout] - Timeout to wait for URL will be opened
* in browser, ms. Default value is `CONF.timeouts.pageLoad`.
* in browser, sec. Default value is `CONF.web.pageTimeout`.
* @return {Promise<void>}
* @throws {Error} If URL wasn't opened after timeout.
*/

opts = U.defVal(opts, {});
var check = U.defVal(opts.check, true);
var timeout = U.defVal(opts.timeout, CONF.timeouts.pageLoad);
var timeout = U.defVal(opts.timeout, CONF.web.pageTimeout) * 1000;

LOG.info(`Openning URL ${webUrl} in browser...`);

Expand Down
74 changes: 49 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"eslint": "^4.19.1",
"glace-core": "^1.3.8",
"glace-core": "^1.4.3",
"ink-docstrap": "^1.3.0",
"jsdoc": "^3.5.5",
"jsdoc-strip-async-await": "^0.1.0",
Expand All @@ -47,7 +47,7 @@
],
"dependencies": {
"chai": "^4.1.2",
"glace-utils": "^1.1.7",
"glace-utils": "^1.1.8",
"lodash": "^4.17.5",
"logfmt": "^1.2.0",
"selenium-standalone": "^6.13.0",
Expand Down

0 comments on commit 584f8fa

Please sign in to comment.