Merge pull request #1298 from MetaMask/tests-fix

Test Framework Fix

3 files changed, 54 insertions, 10 deletions

diff --git a/package.json b/package.json
index 9e04bc6f7..7dfe21f24 100644
--- a/package.json
+++ b/package.json
@@ -5,20 +5,20 @@
   "private": true,
   "scripts": {
     "start": "npm run dev",
-    "lint": "gulp lint",
-    "buildCiUnits": "node test/integration/index.js",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
     "dist": "gulp dist --disableLiveReload",
-    "test": "npm run lint && npm run fastTest && npm run ci",
-    "fastTest": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "test": "npm run lint && npm run test-unit && npm run test-integration",
+    "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
+    "lint": "gulp lint",
+    "buildCiUnits": "node test/integration/index.js",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
     "genStates": "node development/genStates.js",
     "ui": "npm run genStates && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "buildMock": "npm run genStates && browserify ./mock-dev.js -o ./development/bundle.js",
     "testem": "npm run buildMock && testem",
-    "ci": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
     "announce": "node development/announcer.js",
     "generateNotice": "node notices/notice-generator.js",
     "deleteNotice": "node notices/notice-delete.js"
@@ -40,6 +40,7 @@
     "async": "^1.5.2",
     "async-q": "^0.3.1",
     "bip39": "^2.2.0",
+    "bluebird": "^3.5.0",
     "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
     "clone": "^1.0.2",
diff --git a/test/helper.js b/test/helper.js
index a01ea1e53..aaac7580e 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -1,11 +1,54 @@
+// disallow promises from swallowing errors
+enableFailureOnUnhandledPromiseRejection()
+
+// logging util
 var log = require('loglevel')
 log.setDefaultLevel(5)
+global.log = log
 
+//
+// polyfills
+//
+
+// dom
 require('jsdom-global')()
+
+// localStorage
 window.localStorage = {}
 
-if (!('crypto' in window)) { window.crypto = {} }
-window.crypto.getRandomValues = require('polyfill-crypto.getrandomvalues')
+// crypto.getRandomValues
+if (!window.crypto) window.crypto = {}
+if (!window.crypto.getRandomValues) window.crypto.getRandomValues = require('polyfill-crypto.getrandomvalues')
 
-window.log = log
-global.log = log
+
+
+function enableFailureOnUnhandledPromiseRejection() {
+  // overwrite node's promise with the stricter Bluebird promise
+  global.Promise = require('bluebird')
+
+  // modified from https://github.com/mochajs/mocha/issues/1926#issuecomment-180842722
+  
+  // rethrow unhandledRejections
+  if (typeof process !== 'undefined') {
+    process.on('unhandledRejection', function (reason) {
+      throw reason
+    })
+  } else if (typeof window !== 'undefined') {
+    // 2016-02-01: No browsers support this natively, however bluebird, when.js,
+    // and probably other libraries do.
+    if (typeof window.addEventListener === 'function') {
+      window.addEventListener('unhandledrejection', function (evt) {
+        throw evt.detail.reason
+      })
+    } else {
+      var oldOHR = window.onunhandledrejection
+      window.onunhandledrejection = function (evt) {
+        if (typeof oldOHR === 'function') oldOHR.apply(this, arguments)
+        throw evt.detail.reason
+      }
+    }
+  } else if (typeof console !== 'undefined' &&
+      typeof (console.error || console.log) === 'function') {
+    (console.error || console.log)('Unhandled rejections will be ignored!')
+  }
+}
\ No newline at end of file
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index aae4cdfd6..efd0a3546 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -135,7 +135,7 @@ describe('KeyringController', function() {
   })
 
   describe('#getAccounts', function() {
-    it('returns the result of getAccounts for each keyring', function() {
+    it('returns the result of getAccounts for each keyring', function(done) {
       keyringController.keyrings = [
         { getAccounts() { return Promise.resolve([1,2,3]) } },
         { getAccounts() { return Promise.resolve([4,5,6]) } },