summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krotscheck <krotscheck@gmail.com>2015-06-05 11:45:04 -0700
committerMichael Krotscheck <krotscheck@gmail.com>2015-06-16 12:06:21 -0700
commitbc207adde8a365f2a1ca2c36710f454c22c92d9f (patch)
treeb374152cd750c87bd00baee2dcc7ff376ab6cfe5
parentbcc69f218d73409d5396a84b7e5f1f91b8ad15b1 (diff)
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
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Timur Sufiev <tsufiev@mirantis.com> Workflow+1: Timur Sufiev <tsufiev@mirantis.com> Submitted-by: Jenkins Submitted-at: Mon, 22 Jun 2015 14:31:02 +0000 Reviewed-on: https://review.openstack.org/192363 Project: stackforge/merlin Branch: refs/heads/master
-rw-r--r--package.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json
index e01f90d..a6d256f 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
25 "jasmine-core": "^2.2.0", 25 "jasmine-core": "^2.2.0",
26 "karma": "^0.12.31", 26 "karma": "^0.12.31",
27 "karma-chrome-launcher": "^0.1.7", 27 "karma-chrome-launcher": "^0.1.7",
28 "karma-cli": "0.0.4",
28 "karma-jasmine": "^0.3.5", 29 "karma-jasmine": "^0.3.5",
29 "karma-phantomjs-launcher": "^0.1.4", 30 "karma-phantomjs-launcher": "^0.1.4",
30 "karma-ng-html2js-preprocessor": "~0.1" 31 "karma-ng-html2js-preprocessor": "~0.1"
@@ -35,6 +36,7 @@
35 }, 36 },
36 "scripts": { 37 "scripts": {
37 "postinstall": "bower install", 38 "postinstall": "bower install",
38 "test-unit": "grunt test:unit" 39 "test-unit": "grunt test:unit",
40 "test": "karma start ./karma-unit.conf.js"
39 } 41 }
40} 42}