aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVojta Jina2013-03-20 18:57:13 -0700
committerIgor Minar2013-04-03 18:22:03 -0700
commit91fa865bf22afdf4b25a20acce7a8c7f7d331323 (patch)
treeb450929dfc4cba0b80deec58927a779939dfbdfb /lib
parent10ae76673c200511f5da5aa1d5bea200b7be0fda (diff)
downloadangular.js-91fa865bf22afdf4b25a20acce7a8c7f7d331323.tar.bz2
chore: use Karma
Diffstat (limited to 'lib')
-rw-r--r--lib/grunt/plugins.js8
-rw-r--r--lib/grunt/utils.js4
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 : '',