kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-01-12 22:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(ci): update protractor to 1.0.0-rc5 and increase global timeout for loading pages

Browse Source 
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 #8231
This commit is contained in:
Julie Ralph
2014-07-16 22:51:27 -07:00
committed by Igor Minar
parent 8cefb0b628
commit 2474173e18
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
npm-shrinkwrap.json generated
View File

@@ -2738,7 +2738,7 @@
}
},
"protractor": {
"version": "1.0.0-rc4",
"version": "1.0.0-rc5",
"dependencies": {
"request": {
"version": "2.36.0",

2
package.json
View File

@@ -33,7 +33,7 @@
"karma-sauce-launcher": "0.2.0",
"karma-script-launcher": "0.1.0",
"karma-browserstack-launcher": "0.0.7",
"protractor": "1.0.0-rc4",
"protractor": "1.0.0-rc5",
"yaml-js": "~0.0.8",
"rewire": "1.1.3",
"promises-aplus-tests": "~1.3.2",

3
protractor-travis-conf.js
View File

@@ -27,4 +27,7 @@ config.multiCapabilities = [{
'build': process.env.TRAVIS_BUILD_NUMBER
}];
config.allScriptsTimeout = 30000;
config.getPageTimeout = 30000;
exports.config = config;