diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d279d1b32915..36542efdc708 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2738,7 +2738,7 @@ } }, "protractor": { - "version": "1.0.0-rc4", + "version": "1.0.0-rc5", "dependencies": { "request": { "version": "2.36.0", diff --git a/package.json b/package.json index 2004c19c2f29..b04fd7e65d90 100644 --- 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 index c2642bd658f8..b0969b1fa3ad 100644 --- a/protractor-travis-conf.js +++ b/protractor-travis-conf.js @@ -27,4 +27,7 @@ config.multiCapabilities = [{ 'build': process.env.TRAVIS_BUILD_NUMBER }]; +config.allScriptsTimeout = 30000; +config.getPageTimeout = 30000; + exports.config = config;