Skip to content

Commit 2474173

Browse files
juliemrIgorMinar
authored andcommitted
chore(ci): update protractor to 1.0.0-rc5 and increase global timeout for loading pages
This should help with occasional safari page load timeouts. In a test of 4500 page loads, the current 10 second limit caused 3 errors while a 30 second limit caused none. Closes angular#8231
1 parent 8cefb0b commit 2474173

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

npm-shrinkwrap.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"karma-sauce-launcher": "0.2.0",
3434
"karma-script-launcher": "0.1.0",
3535
"karma-browserstack-launcher": "0.0.7",
36-
"protractor": "1.0.0-rc4",
36+
"protractor": "1.0.0-rc5",
3737
"yaml-js": "~0.0.8",
3838
"rewire": "1.1.3",
3939
"promises-aplus-tests": "~1.3.2",

protractor-travis-conf.js

+3
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ config.multiCapabilities = [{
2727
'build': process.env.TRAVIS_BUILD_NUMBER
2828
}];
2929

30+
config.allScriptsTimeout = 30000;
31+
config.getPageTimeout = 30000;
32+
3033
exports.config = config;

0 commit comments

Comments
 (0)