aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-06-26 07:16:51 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-06-27 03:21:50 +0800
commit94a4f99115cf549a3014d29d828e7a432bf36a62 (patch)
tree9bf21a384d5a19efa8401e57124084c8bda45027 /test
parent7b1f57e05d7a186be085ffcc8807516499218cba (diff)
downloadtangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar.gz
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar.bz2
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar.lz
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar.xz
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.tar.zst
tangerine-wallet-browser-94a4f99115cf549a3014d29d828e7a432bf36a62.zip
tests - fix cancle transaction test to better fit new behavior
Diffstat (limited to 'test')
-rw-r--r--test/unit/app/controllers/transactions/tx-controller-test.js13
-rw-r--r--test/unit/app/controllers/transactions/tx-state-manager-test.js10
2 files changed, 10 insertions, 13 deletions
diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
index 9bdfe7c1a..4328f38e5 100644
--- a/test/unit/app/controllers/transactions/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -357,9 +357,16 @@ describe('Transaction Controller', function () {
])
})
- it('should set the transaction to rejected from unapproved', async function () {
- await txController.cancelTransaction(0)
- assert.equal(txController.txStateManager.getTx(0).status, 'rejected')
+ it('should emit a status change to rejected', function (done) {
+ txController.once('tx:status-update', (txId, status) => {
+ try {
+ assert.equal(status, 'rejected', 'status should e rejected')
+ assert.equal(txId, 0, 'id should e 0')
+ done()
+ } catch (e) { done(e) }
+ })
+
+ txController.cancelTransaction(0)
})
})
diff --git a/test/unit/app/controllers/transactions/tx-state-manager-test.js b/test/unit/app/controllers/transactions/tx-state-manager-test.js
index 8b7dc78aa..39c2d6337 100644
--- a/test/unit/app/controllers/transactions/tx-state-manager-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-manager-test.js
@@ -45,16 +45,6 @@ describe('TransactionStateManager', function () {
})
describe('#setTxStatusRejected', function () {
- it('sets the tx status to rejected', function () {
- let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
- txStateManager.addTx(tx)
- txStateManager.setTxStatusRejected(1)
- let result = txStateManager.getTxList()
- assert.ok(Array.isArray(result))
- assert.equal(result.length, 1)
- assert.equal(result[0].status, 'rejected')
- })
-
it('should emit a rejected event to signal the exciton of callback', (done) => {
let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx)