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

juliemr · IgorMinar · commit afdb4f1b76ea · 2014-07-16T23:10:05.000-07:00
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
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -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",
diff --git a/protractor-travis-conf.js b/protractor-travis-conf.js
@@ -25,4 +25,7 @@ config.multiCapabilities = [{
   'build': process.env.TRAVIS_BUILD_NUMBER
 }];
 
+config.allScriptsTimeout = 30000;
+config.getPageTimeout = 30000;
+
 exports.config = config;
