diff options
| author | Vojta Jina | 2013-03-20 18:57:13 -0700 | 
|---|---|---|
| committer | Vojta Jina | 2013-04-01 12:24:27 -0700 | 
| commit | c2e215fab6ba73e195f8c32701cfb6e88e8e1ebd (patch) | |
| tree | e97578b6e2b7e72b59962c14c7462da65d0d02a0 /lib/grunt | |
| parent | 61f2767ce65562257599649d9eaf9da08f321655 (diff) | |
| download | angular.js-c2e215fab6ba73e195f8c32701cfb6e88e8e1ebd.tar.bz2 | |
chore: use Karma
Diffstat (limited to 'lib/grunt')
| -rw-r--r-- | lib/grunt/plugins.js | 8 | ||||
| -rw-r--r-- | lib/grunt/utils.js | 4 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js index c67aa545..b423b61f 100644 --- a/lib/grunt/plugins.js +++ b/lib/grunt/plugins.js @@ -50,12 +50,12 @@ module.exports = function(grunt) {    }); -  grunt.registerMultiTask('test', 'Run the unit tests with testacular', function(){ -    util.startTestacular.call(util, this.data, true, this.async()); +  grunt.registerMultiTask('test', 'Run the unit tests with Karma', function(){ +    util.startKarma.call(util, this.data, true, this.async());    }); -  grunt.registerMultiTask('autotest', 'Run and watch the unit tests with testacular', function(){ -    util.startTestacular.call(util, this.data, false, this.async()); +  grunt.registerMultiTask('autotest', 'Run and watch the unit tests with Karma', function(){ +    util.startKarma.call(util, this.data, false, this.async());    });  }; diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 80a41f30..abc71816 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -30,11 +30,11 @@ module.exports = {    }, -  startTestacular: function(config, singleRun, done){ +  startKarma: function(config, singleRun, done){      var browsers = grunt.option('browsers');      var reporters = grunt.option('reporters');      var noColor = grunt.option('no-colors'); -    var p = spawn('node', ['node_modules/testacular/bin/testacular', 'start', config, +    var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,        singleRun ? '--single-run=true' : '',        reporters ? '--reporters=' + reporters : '',        browsers ? '--browsers=' + browsers : '', | 
