Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Blade Barringer
2016-01-18 18:04:07 -06:00
parent 64c4f0f94a 5b740b1a11
commit 32a2b3121e
12 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -99,14 +99,14 @@
"test:api-v3": "mocha test/api/v3 --recursive",
"test:api-v3:unit": "mocha test/api/v3/unit --recursive",
"test:api-v3:integration": "mocha test/api/v3/integration --recursive",
"test:api-legacy": "istanbul cover -i \"website/src/**\" --dir coverage/api mocha test/api-legacy",
"test:api-legacy": "istanbul cover -i \"website/src/**\" --dir coverage/api ./node_modules/mocha/bin/_mocha test/api-legacy",
"test:common": "mocha test/common",
"test:content": "mocha test/content",
"test:karma": "karma start --single-run",
"test:karma:watch": "karma start",
"test:prepare:webdriver": "webdriver-manager update",
"test:e2e:webdriver": "webdriver-manager start",
"test:e2e": "DISPLAY=:99 NODE_ENV=testing protractor protractor.conf.js",
"test:e2e": "protractor protractor.conf.js",
"test:nodemon": "gulp test:nodemon",
"start": "gulp run:dev",
"sprites": "gulp sprites:compile",