aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojta Jina2013-03-20 18:57:13 -0700
committerIgor Minar2013-04-03 18:22:03 -0700
commit91fa865bf22afdf4b25a20acce7a8c7f7d331323 (patch)
treeb450929dfc4cba0b80deec58927a779939dfbdfb
parent10ae76673c200511f5da5aa1d5bea200b7be0fda (diff)
downloadangular.js-91fa865bf22afdf4b25a20acce7a8c7f7d331323.tar.bz2
chore: use Karma
-rw-r--r--Gruntfile.js12
-rw-r--r--angularFiles.js2
-rw-r--r--karma-e2e.conf.js (renamed from testacular-e2e.conf.js)0
-rw-r--r--karma-jqlite.conf.js (renamed from testacular-jqlite.conf.js)0
-rw-r--r--karma-jquery.conf.js (renamed from testacular-jquery.conf.js)0
-rw-r--r--karma-modules.conf.js (renamed from testacular-modules.conf.js)0
-rw-r--r--lib/grunt/plugins.js8
-rw-r--r--lib/grunt/utils.js4
-rw-r--r--package.json2
9 files changed, 14 insertions, 14 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index eea8b8ab..2cbfcda3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,17 +45,17 @@ module.exports = function(grunt) {
test: {
- jqlite: 'testacular-jqlite.conf.js',
- jquery: 'testacular-jquery.conf.js',
- modules: 'testacular-modules.conf.js',
+ jqlite: 'karma-jqlite.conf.js',
+ jquery: 'karma-jquery.conf.js',
+ modules: 'karma-modules.conf.js',
//NOTE run grunt test:e2e instead and it will start a webserver for you
- end2end: 'testacular-e2e.conf.js'
+ end2end: 'karma-e2e.conf.js'
},
autotest: {
- jqlite: 'testacular-jqlite.conf.js',
- jquery: 'testacular-jquery.conf.js'
+ jqlite: 'karma-jqlite.conf.js',
+ jquery: 'karma-jquery.conf.js'
},
diff --git a/angularFiles.js b/angularFiles.js
index 47f18961..20d94360 100644
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -201,7 +201,7 @@ if (exports) {
var files = [];
[].splice.call(arguments, 0).forEach(function(file) {
- if (file.match(/testacular/)) {
+ if (file.match(/karma/)) {
files.push(file);
} else {
angularFiles[file].forEach(function(f) {
diff --git a/testacular-e2e.conf.js b/karma-e2e.conf.js
index 07c79c70..07c79c70 100644
--- a/testacular-e2e.conf.js
+++ b/karma-e2e.conf.js
diff --git a/testacular-jqlite.conf.js b/karma-jqlite.conf.js
index 6cb98114..6cb98114 100644
--- a/testacular-jqlite.conf.js
+++ b/karma-jqlite.conf.js
diff --git a/testacular-jquery.conf.js b/karma-jquery.conf.js
index 7b527a15..7b527a15 100644
--- a/testacular-jquery.conf.js
+++ b/karma-jquery.conf.js
diff --git a/testacular-modules.conf.js b/karma-modules.conf.js
index 9fea7d58..9fea7d58 100644
--- a/testacular-modules.conf.js
+++ b/karma-modules.conf.js
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 : '',
diff --git a/package.json b/package.json
index 2398c921..37fa8cbd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "AngularJS",
"version": "0.0.0",
"dependencies": {
- "testacular": "0.5.9",
"jasmine-node": "1.2.3",
"q-fs": "0.1.36",
"qq": "0.3.5",
@@ -12,6 +11,7 @@
"grunt-contrib-connect": "0.1.2",
"grunt-contrib-compress": "0.4.1",
"shelljs": "0.1.2",
+ "karma": "~0.8",
"yaml-js": "0.0.5"
}
}