Merge branch 'master' of github.com:ParsePlatform/parse-server

2016-02-02 18:08:37 -08:00
parent c430ee94da 3c3f1e5365
commit 3d3a97d151
2 changed files with 5 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ node_modules

 # Emacs
 *~
+
+# WebStorm/IntelliJ
+.idea
--- a/package.json
+++ b/package.json
@@ -22,10 +22,11 @@
    "request": "^2.65.0"
  },
  "devDependencies": {
+    "istanbul": "^0.4.2",
    "jasmine": "^2.3.2"
  },
  "scripts": {
-    "test": "TESTING=1 ./node_modules/.bin/jasmine"
+    "test": "TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources ./node_modules/.bin/jasmine"
  },
  "engines": {
    "node": ">=4.1"