Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx

1 files changed, 6 insertions, 2 deletions

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 7b86cfe14..31908569a 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -343,13 +343,17 @@ describe('Transaction Controller', function () {
       // Adding the fake tx:
       txController.addTx(clone(txMeta))
 
-      txController._resubmitTx(txMeta, function (err) {
-        assert.ifError(err, 'should not throw an error')
+      txController._resubmitTx(txMeta)
+      .then(() => {
         const updatedMeta = txController.getTx(txMeta.id)
         assert.notEqual(updatedMeta.status, txMeta.status, 'status changed.')
         assert.equal(updatedMeta.status, 'failed', 'tx set to failed.')
         done()
       })
+      .catch((err) => {
+        assert.ifError(err, 'should not throw an error')
+        done()
+      })
     })
   })
 })