aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-27 00:51:20 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-27 00:51:20 +0800
commit16ba2e6a30fc55bb1601d96696bd08ae177f631e (patch)
tree013df9dcd147ba3ffd303c7ae3bab7be5e744638 /test/unit
parentb22783a223e84e541db9c1e2d411ef27f62d7e62 (diff)
parent50633fbba6d5db782efe1bf8e01294354ea6070c (diff)
downloadtangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.gz
tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.zst
tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.zip
Merge branch 'master' into new-currency-test
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/keyring-controller-test.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 2d9a53723..8d0d75f12 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -27,12 +27,9 @@ describe('KeyringController', function () {
ethStore: {
addAccount (acct) { accounts.push(ethUtil.addHexPrefix(acct)) },
},
+ encryptor: mockEncryptor,
})
- // Stub out the browser crypto for a mock encryptor.
- // Browser crypto is tested in the integration test suite.
- keyringController.encryptor = mockEncryptor
-
keyringController.createNewVaultAndKeychain(password)
.then(function (newState) {
newState