Skip to content

Commit 91fa865

Browse files
vojtajinaIgorMinar
vojtajina
authored and
IgorMinar
committed
chore: use Karma
1 parent 10ae766 commit 91fa865

9 files changed

Lines changed: 14 additions & 14 deletions

‎Gruntfile.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ module.exports = function(grunt) {
4545

4646

4747
test: {
48-
jqlite: 'testacular-jqlite.conf.js',
49-
jquery: 'testacular-jquery.conf.js',
50-
modules: 'testacular-modules.conf.js',
48+
jqlite: 'karma-jqlite.conf.js',
49+
jquery: 'karma-jquery.conf.js',
50+
modules: 'karma-modules.conf.js',
5151
//NOTE run grunt test:e2e instead and it will start a webserver for you
52-
end2end: 'testacular-e2e.conf.js'
52+
end2end: 'karma-e2e.conf.js'
5353
},
5454

5555

5656
autotest: {
57-
jqlite: 'testacular-jqlite.conf.js',
58-
jquery: 'testacular-jquery.conf.js'
57+
jqlite: 'karma-jqlite.conf.js',
58+
jquery: 'karma-jquery.conf.js'
5959
},
6060

6161

‎angularFiles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ if (exports) {
201201
var files = [];
202202

203203
[].splice.call(arguments, 0).forEach(function(file) {
204-
if (file.match(/testacular/)) {
204+
if (file.match(/karma/)) {
205205
files.push(file);
206206
} else {
207207
angularFiles[file].forEach(function(f) {

testacular-e2e.conf.js renamed to karma-e2e.conf.js

File renamed without changes.

testacular-jqlite.conf.js renamed to karma-jqlite.conf.js

File renamed without changes.

testacular-jquery.conf.js renamed to karma-jquery.conf.js

File renamed without changes.

testacular-modules.conf.js renamed to karma-modules.conf.js

File renamed without changes.

‎lib/grunt/plugins.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ module.exports = function(grunt) {
5050
});
5151

5252

53-
grunt.registerMultiTask('test', 'Run the unit tests with testacular', function(){
54-
util.startTestacular.call(util, this.data, true, this.async());
53+
grunt.registerMultiTask('test', 'Run the unit tests with Karma', function(){
54+
util.startKarma.call(util, this.data, true, this.async());
5555
});
5656

5757

58-
grunt.registerMultiTask('autotest', 'Run and watch the unit tests with testacular', function(){
59-
util.startTestacular.call(util, this.data, false, this.async());
58+
grunt.registerMultiTask('autotest', 'Run and watch the unit tests with Karma', function(){
59+
util.startKarma.call(util, this.data, false, this.async());
6060
});
6161
};

‎lib/grunt/utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ module.exports = {
3030
},
3131

3232

33-
startTestacular: function(config, singleRun, done){
33+
startKarma: function(config, singleRun, done){
3434
var browsers = grunt.option('browsers');
3535
var reporters = grunt.option('reporters');
3636
var noColor = grunt.option('no-colors');
37-
var p = spawn('node', ['node_modules/testacular/bin/testacular', 'start', config,
37+
var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
3838
singleRun ? '--single-run=true' : '',
3939
reporters ? '--reporters=' + reporters : '',
4040
browsers ? '--browsers=' + browsers : '',

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "AngularJS",
33
"version": "0.0.0",
44
"dependencies": {
5-
"testacular": "0.5.9",
65
"jasmine-node": "1.2.3",
76
"q-fs": "0.1.36",
87
"qq": "0.3.5",
@@ -12,6 +11,7 @@
1211
"grunt-contrib-connect": "0.1.2",
1312
"grunt-contrib-compress": "0.4.1",
1413
"shelljs": "0.1.2",
14+
"karma": "~0.8",
1515
"yaml-js": "0.0.5"
1616
}
1717
}

0 commit comments

Comments
 (0)