From 1fe7f76f6b518ed172548d2410390bfbe1ef719b Mon Sep 17 00:00:00 2001 From: Iskren Chernev Date: Wed, 25 Mar 2015 09:00:36 -0700 Subject: [PATCH] Make sure karma/sauce works with the new setup --- Gruntfile.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0f9cf7dfe..cfb7dca13 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -9,8 +9,8 @@ module.exports = function (grunt) { options: { frameworks: ['qunit'], files: [ - 'build/umd/min/moment-with-locales.js', - 'build/umd/min/tests.js' + 'min/moment-with-locales.js', + 'min/tests.js' ], sauceLabs: { startConnect: true, @@ -58,7 +58,9 @@ module.exports = function (grunt) { browsers: ['Firefox'] }, sauce: { - options: {reporters: ['dots']}, + options: { + reporters: ['dots'] + }, singleRun: true, browsers: [ 'slChromeWinXp', @@ -165,10 +167,11 @@ module.exports = function (grunt) { // test tasks grunt.registerTask('test', ['test:node']); grunt.registerTask('test:node', ['transpile', 'qtest']); - grunt.registerTask('test:server', ['transpile', 'karma:server']); - grunt.registerTask('test:browser', ['transpile', 'karma:chrome', 'karma:firefox']); - grunt.registerTask('test:sauce-browser', ['transpile', 'env:sauceLabs', 'karma:sauce']); - grunt.registerTask('test:travis-sauce-browser', ['transpile', 'karma:sauce']); + // TODO: For some weird reason karma doesn't like the files in + // build/umd/min/* but works with min/*, so update-index, then git checkout + grunt.registerTask('test:server', ['transpile', 'update-index', 'karma:server']); + grunt.registerTask('test:browser', ['transpile', 'update-index', 'karma:chrome', 'karma:firefox']); + grunt.registerTask('test:sauce-browser', ['transpile', 'update-index', 'env:sauceLabs', 'karma:sauce']); grunt.registerTask('test:meteor', ['exec:meteor-init', 'exec:meteor-test', 'exec:meteor-cleanup']); // travis build task -- 2.47.2