travis?

Author: cnishina

spec/ciFullConf.js

@@ -33,16 +33,13 @@ exports.config = {
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
     'name': 'Protractor suite tests',
-    'version': '54',
-    'selenium-version': '2.53.1',
-    'chromedriver-version': '2.26',
-    'platform': 'OS X 10.11'
+    'version': '70'
   }, {
     'browserName': 'firefox',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
     'name': 'Protractor suite tests',
-    'version': '47',
+    'version': '60',
   }],
 
   baseUrl: env.baseUrl + '/ng1/',

spec/ciNg2Conf.js

@@ -1,21 +1,3 @@
-exports.config = require('./angular2Conf.js').config;
-
-exports.config.sauceUser = process.env.SAUCE_USERNAME;
-exports.config.sauceKey = process.env.SAUCE_ACCESS_KEY;
-exports.config.seleniumAddress = undefined;
-
-// TODO: add in firefox when issue #2784 is fixed
-exports.config.multiCapabilities = [{
-    'browserName': 'chrome',
-    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
-    'build': process.env.TRAVIS_BUILD_NUMBER,
-    'name': 'Protractor suite tests',
-    'version': '54',
-    'selenium-version': '2.53.1',
-    'chromedriver-version': '2.26',
-    'platform': 'OS X 10.11'
-  }];
-exports.config.capabilities = undefined;
-exports.config.allScriptsTimeout = 120000;
-exports.config.getPageTimeout = 120000;
-exports.config.jasmineNodeOpts.defaultTimeoutInterval = 120000;
+exports.config = require('./ciFullConf.js').config;
+exports.config.specs = require('./angular2Conf.js').config.specs;
+exports.config.exclude = undefined;