honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixes #5380

Closes #5387
This commit is contained in:
Marc Laval 2015-11-19 21:19:04 +01:00
parent 4e12b0831e
commit 4d59985b74
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gulpfile.js
View File

@ -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',

2
modules/angular1_router/karma-router.conf.js
View File

@ -23,7 +23,7 @@ module.exports = function (config) {
customLaunchers: browserProvidersConf.customLaunchers,
browsers: ['ChromeCanary']
browsers: ['Chrome']
};
config.set(options);

2
scripts/ci/test_js.sh
View File

@ -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

2
scripts/ci/test_router.sh
View File

@ -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}