Merge branch 'master' into NewUI

2 files changed, 17 insertions, 4 deletions

diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index 0ea1bfdc7..67c72e9a5 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -45,13 +45,15 @@ describe('tx confirmation screen', function () {
       before(function (done) {
         actions._setBackgroundConnection({
           approveTransaction (txId, cb) { cb('An error!') },
-          cancelTransaction (txId) { /* noop */ },
+          cancelTransaction (txId, cb) { cb() },
           clearSeedWordCache (cb) { cb() },
         })
 
-        const action = actions.cancelTx({value: firstTxId})
-        result = reducers(initialState, action)
-        done()
+        actions.cancelTx({value: firstTxId})((action) => {
+          result = reducers(initialState, action)
+          done()
+        })
+        
       })
 
       it('should transition to the account detail view', function () {
diff --git a/test/unit/nodeify-test.js b/test/unit/nodeify-test.js
index 06241334d..537dae605 100644
--- a/test/unit/nodeify-test.js
+++ b/test/unit/nodeify-test.js
@@ -17,4 +17,15 @@ describe('nodeify', function () {
       done()
     })
   })
+
+  it('should throw if the last argument is not a function', function (done) {
+    const nodified = nodeify(obj.promiseFunc, obj)
+    try {
+      nodified('baz')
+      done(new Error('should have thrown if the last argument is not a function'))
+    } catch (err) {
+      assert.equal(err.message, 'callback is not a function')
+      done()
+    }
+  })
 })