chore(build): use Chrome by default for all JS tests

marclaval · marclaval · commit 4d59985b745f · 2015-11-19T23:27:42.000Z
Fixes angular#5380 Closes angular#5387
diff --git a/gulpfile.js b/gulpfile.js
@@ -430,9 +430,10 @@ gulp.task('test.all.dart', shell.task(['./scripts/ci/test_dart.sh']));
 // karma tests
 //     These tests run in the browser and are allowed to access
 //     HTML DOM APIs.
-function getBrowsersFromCLI(provider) {
+function getBrowsersFromCLI(provider, isDart) {
   var isProvider = false;
-  var rawInput = cliArgs.browsers ? cliArgs.browsers : 'DartiumWithWebPlatform';
+  var rawInput =
+      cliArgs.browsers ? cliArgs.browsers : (isDart ? 'DartiumWithWebPlatform' : 'Chrome');
   var inputList = rawInput.replace(' ', '').split(',');
   var outputList = [];
   for (var i = 0; i < inputList.length; i++) {
@@ -646,7 +647,7 @@ gulp.task('test.unit.js.browserstack/ci', function(done) {
 });
 
 gulp.task('test.unit.dart/ci', function(done) {
-  var browserConf = getBrowsersFromCLI();
+  var browserConf = getBrowsersFromCLI(null, true);
   new karma.Server(
                {
                  configFile: __dirname + '/karma-dart.conf.js',
diff --git a/modules/angular1_router/karma-router.conf.js b/modules/angular1_router/karma-router.conf.js
@@ -23,7 +23,7 @@ module.exports = function (config) {
 
     customLaunchers: browserProvidersConf.customLaunchers,
 
-    browsers: ['ChromeCanary']
+    browsers: ['Chrome']
   };
 
   config.set(options);
diff --git a/scripts/ci/test_js.sh b/scripts/ci/test_js.sh
@@ -13,5 +13,5 @@ if  ${SCRIPT_DIR}/env_dart.sh 2>&1 > /dev/null ; then
 fi
 
 ./node_modules/.bin/gulp pre-test-checks
-./node_modules/.bin/gulp test.js --browsers=${KARMA_BROWSERS:-ChromeCanary}
+./node_modules/.bin/gulp test.js --browsers=${KARMA_BROWSERS:-Chrome}
 ${SCRIPT_DIR}/test_e2e_js.sh
diff --git a/scripts/ci/test_router.sh b/scripts/ci/test_router.sh
@@ -7,4 +7,4 @@ SCRIPT_DIR=$(dirname $0)
 source $SCRIPT_DIR/env_dart.sh
 cd $SCRIPT_DIR/../..
 
-./node_modules/.bin/gulp test.unit.router/ci --browsers=${KARMA_BROWSERS:-ChromeCanary}
+./node_modules/.bin/gulp test.unit.router/ci --browsers=${KARMA_BROWSERS:-Chrome}
