fix(tests): separate remote and local test runs

Author: vbudhram

npm-shrinkwrap.json

@@ -111,7 +111,7 @@
     "nock": "8.0.0",
     "npmshrink": "1.0.1",
     "nyc": "13.0.0",
-    "proxyquire": "1.8.0",
+    "proxyquire": "2.0.0",
     "simplesmtp": "0.3.35",
     "sinon": "1.17.5",
     "sjcl": "1.0.6",

package.json

@@ -13,7 +13,7 @@ const MOCHA_BIN = path.join(path.dirname(__dirname), 'node_modules', '.bin', 'mo
 const NYC_BIN = path.join(path.dirname(__dirname), 'node_modules', '.bin', 'nyc')
 
 let bin = NYC_BIN
-let argv = ['--cache', MOCHA_BIN]
+let argv = ['--cache', '--no-clean', MOCHA_BIN]
 
 if (process.env.NO_COVERAGE) {
   bin = MOCHA_BIN

scripts/mocha-coverage.js

@@ -7,14 +7,20 @@ if [ -z "$CORS_ORIGIN" ]; then export CORS_ORIGIN="http://foo,http://bar"; fi;
 
 set -u
 
-GLOB=$*
-if [ -z "$GLOB" ]; then
-  GLOB="test/local test/remote"
-fi
-
 DEFAULT_ARGS="-R dot --recursive --timeout 5000 --exit"
 
 ./scripts/gen_keys.js
 ./scripts/gen_vapid_keys.js
-./scripts/mocha-coverage.js $DEFAULT_ARGS $GLOB
+
+GLOB=$*
+if [ -z "$GLOB" ]; then
+  echo "Local tests"
+  ./scripts/mocha-coverage.js $DEFAULT_ARGS test/local
+
+  echo "Remote tests"
+  ./scripts/mocha-coverage.js $DEFAULT_ARGS test/remote
+else
+  ./scripts/mocha-coverage.js $DEFAULT_ARGS $GLOB
+fi
+
 grunt eslint copyright

scripts/test-local.sh

@@ -683,15 +683,13 @@ describe('remote db', function() {
         .then(function(passwordForgotToken) {
           return db.forgotPasswordVerified(passwordForgotToken)
             .then(accountResetToken => {
-              assert.ok(accountResetToken.createdAt > passwordForgotToken.createdAt, 'account reset token should be newer than password forgot token')
+              assert.ok(accountResetToken.createdAt >= passwordForgotToken.createdAt, 'account reset token should be equal or newer than password forgot token')
               return accountResetToken
             })
         })
         .then(function(accountResetToken) {
           assert.deepEqual(accountResetToken.uid, account.uid, 'account reset token uid should be the same as the account.uid')
           tokenId = accountResetToken.id
-        })
-        .then(function() {
           return db.accountResetToken(tokenId)
         })
         .then(function(accountResetToken) {
@@ -702,15 +700,13 @@ describe('remote db', function() {
         .then(function(accountResetToken) {
           return db.deleteAccountResetToken(accountResetToken)
         })
-        .then(function() {
+        .then(function () {
           return db.accountResetToken(tokenId)
-        })
-        .then(function(accountResetToken) {
-          assert(false, 'The above accountResetToken() call should fail, since the accountResetToken has been deleted')
-        }, function(err) {
-          assert.equal(err.errno, 110, 'accountResetToken() fails with the correct error code')
-          var msg = 'Error: The authentication token could not be found'
-          assert.equal(msg, '' + err, 'accountResetToken() fails with the correct message')
+            .then(assert.fail, function (err) {
+              assert.equal(err.errno, 110, 'accountResetToken() fails with the correct error code')
+              var msg = 'Error: The authentication token could not be found'
+              assert.equal(msg, '' + err, 'accountResetToken() fails with the correct message')
+            })
         })
     }
   )