diff --git a/spec/ciFullConf.js b/spec/ciFullConf.js index 48cb55d98..e985e0ad1 100644 --- a/spec/ciFullConf.js +++ b/spec/ciFullConf.js @@ -37,9 +37,12 @@ exports.config = { baseUrl: env.baseUrl + '/ng1/', + allScriptsTimeout: 120000, + getPageTimeout: 120000, + jasmineNodeOpts: { showTiming: true, - defaultTimeoutInterval: 90000 + defaultTimeoutInterval: 120000 }, params: { diff --git a/spec/ciNg2Conf.js b/spec/ciNg2Conf.js index dd164da25..b0ad6277c 100644 --- a/spec/ciNg2Conf.js +++ b/spec/ciNg2Conf.js @@ -16,3 +16,6 @@ exports.config.multiCapabilities = [{ 'platform': 'OS X 10.9' }]; exports.config.capabilities = undefined; +exports.config.allScriptsTimeout = 120000; +exports.config.getPageTimeout = 120000; +exports.config.jasmineNodeOpts.defaultTimeoutInterval = 120000; diff --git a/spec/ciSmokeConf.js b/spec/ciSmokeConf.js index aedb5f7ee..4246c4f1a 100644 --- a/spec/ciSmokeConf.js +++ b/spec/ciSmokeConf.js @@ -71,12 +71,12 @@ exports.config = { baseUrl: env.baseUrl + '/ng1/', // Up the timeouts for the slower browsers (IE, Safari). - allScriptsTimeout: 30000, - getPageTimeout: 30000, + allScriptsTimeout: 120000, + getPageTimeout: 120000, jasmineNodeOpts: { showTiming: true, - defaultTimeoutInterval: 90000 + defaultTimeoutInterval: 120000 }, params: {