Removed grunt test-unit in favor of just running karma
There's no actual need to use grunt to run karma. So we're not. Change-Id: Iab0c6b0f04466ac045e0510370865bb99aea8e3d
This commit is contained in:
parent
265859f79d
commit
ff2736945f
29
Gruntfile.js
29
Gruntfile.js
@ -532,17 +532,6 @@ module.exports = function (grunt) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* grunt karma:unit / grunt karma:integration
|
|
||||||
*
|
|
||||||
* This task runs the unit or integration suite on the compiled code.
|
|
||||||
*/
|
|
||||||
karma: {
|
|
||||||
unit: {
|
|
||||||
configFile: './karma-unit.conf.js'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* grunt shell:xvfbStart / grunt shell:xvfbStop
|
* grunt shell:xvfbStart / grunt shell:xvfbStop
|
||||||
*
|
*
|
||||||
@ -656,22 +645,6 @@ module.exports = function (grunt) {
|
|||||||
'watch'
|
'watch'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
/**
|
|
||||||
* grunt test:unit
|
|
||||||
*
|
|
||||||
* This command will create a clean build against which our unit
|
|
||||||
* tests will be run. For more information, please see
|
|
||||||
* karma-unit.conf.js
|
|
||||||
*/
|
|
||||||
grunt.registerTask('test:unit', [
|
|
||||||
'clean',
|
|
||||||
'bower:install',
|
|
||||||
'compile',
|
|
||||||
'useminPrepare',
|
|
||||||
'concat',
|
|
||||||
'karma:unit'
|
|
||||||
]);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* grunt test:integration
|
* grunt test:integration
|
||||||
*
|
*
|
||||||
@ -692,7 +665,7 @@ module.exports = function (grunt) {
|
|||||||
*
|
*
|
||||||
* This command will create a clean build against which our functional
|
* This command will create a clean build against which our functional
|
||||||
* tests will be run. For more information, please see
|
* tests will be run. For more information, please see
|
||||||
* karma-functional.conf.js
|
* protractor.conf.js
|
||||||
*/
|
*/
|
||||||
grunt.registerTask('test:functional', [
|
grunt.registerTask('test:functional', [
|
||||||
'clean',
|
'clean',
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "./node_modules/.bin/grunt clean",
|
"clean": "./node_modules/.bin/grunt clean",
|
||||||
"lint": "eslint ./",
|
"lint": "eslint ./",
|
||||||
"test-unit": "./node_modules/.bin/grunt test:unit",
|
"pretest-unit": "grunt build",
|
||||||
|
"test-unit": "karma start ./karma-unit.conf.js",
|
||||||
"test-functional": "./node_modules/.bin/grunt test:functional",
|
"test-functional": "./node_modules/.bin/grunt test:functional",
|
||||||
"test-integration": "./node_modules/.bin/grunt test:integration",
|
"test-integration": "./node_modules/.bin/grunt test:integration",
|
||||||
"draft": "./node_modules/.bin/grunt build:draft",
|
"draft": "./node_modules/.bin/grunt build:draft",
|
||||||
@ -45,7 +46,6 @@
|
|||||||
"grunt-env": "0.4.1",
|
"grunt-env": "0.4.1",
|
||||||
"grunt-gitinfo": "^0.1.7",
|
"grunt-gitinfo": "^0.1.7",
|
||||||
"grunt-html2js": "0.2.9",
|
"grunt-html2js": "0.2.9",
|
||||||
"grunt-karma": "0.12.2",
|
|
||||||
"grunt-open": "0.2.3",
|
"grunt-open": "0.2.3",
|
||||||
"grunt-protractor-runner": "1.1.4",
|
"grunt-protractor-runner": "1.1.4",
|
||||||
"grunt-shell": "1.1.1",
|
"grunt-shell": "1.1.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user