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

gfosco · gfosco · commit 3d3a97d15169 · 2016-02-02T18:08:37.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,6 @@ node_modules
 
 # Emacs
 *~
+
+# WebStorm/IntelliJ
+.idea
diff --git 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"

-Original file line number
+Diff line change
 # Emacs
 *~
++
 +# WebStorm/IntelliJ
 +.idea