Merge remote-tracking branch 'origin/master' into AddTokenList

1 files changed, 3 insertions, 2 deletions

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 3954300a8..f0d8a706e 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -311,12 +311,13 @@ describe('Transaction Controller', function () {
   })
 
   describe('#sign replay-protected tx', function () {
-    it('prepares a tx with the chainId set', function () {
+    it('prepares a tx with the chainId set', function (done) {
       txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
       txController.signTransaction('1', (err, rawTx) => {
-        if (err) return assert.fail('it should not fail')
+        if (err) return done('it should not fail')
         const ethTx = new EthTx(ethUtil.toBuffer(rawTx))
         assert.equal(ethTx.getChainId(), currentNetworkId)
+        done()
       })
     })
   })