Merge 624032b into 3b792d7

rjz · Mar 28, 2019 · ec53175 · ec53175
2 parents 3b792d7 + 624032b
commit ec53175
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 74 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,4 @@ env:
 
 sudo: false
 
-after_success: ./tasks/travis_after_success.sh
+after_success: npm run cover
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "lint": "jshint .",
     "pretest": "npm run lint",
-    "test": "nyc jasmine-node test --forceexit",
+    "test": "nyc jasmine test/*",
     "cover": "nyc report --reporter=text-lcov | coveralls"
   },
   "repository": {
@@ -44,7 +44,7 @@
     "cookie-session": "^1.3.3",
     "coveralls": "^3.0.3",
     "express": "^4.16.4",
-    "jasmine-node": "^1.16.2",
+    "jasmine": "^3.3.1",
     "jshint": "^2.10.2",
     "nyc": "^13.3.0",
     "supertest": "^4.0.2"

diff --git a/tasks/travis_after_success.sh b/tasks/travis_after_success.sh