x
/
merlin
Code Issues Proposed changes

Bound karma execution to `npm run test` 

This is in anticipation of moving this project to using
the javascript-jobs group, rather than explicitly declaring jobs.

Change-Id: I2f77f92745849f742290a3877fe78cc2e39b13b9
This commit is contained in:
Michael Krotscheck 2015-06-05 11:45:04 -07:00
parent bcc69f218d
commit bc207adde8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -25,6 +25,7 @@
"jasmine-core": "^2.2.0",
"karma": "^0.12.31",
"karma-chrome-launcher": "^0.1.7",
"karma-cli": "0.0.4",
"karma-jasmine": "^0.3.5",
"karma-phantomjs-launcher": "^0.1.4",
"karma-ng-html2js-preprocessor": "~0.1"
@ -35,6 +36,7 @@
},
"scripts": {
"postinstall": "bower install",
"test-unit": "grunt test:unit"
"test-unit": "grunt test:unit",
"test": "karma start ./karma-unit.conf.js"
}
}