aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-11-23 08:22:31 +0800
committerGitHub <noreply@github.com>2016-11-23 08:22:31 +0800
commit427a10308309e7d4792878ce997728a9a25cb39b (patch)
tree3b18e5b80e9493d0badd25657cf7e08ab93d7633 /test/unit
parentc8176c9439cebf2cf65efbc73a633f8e1b643128 (diff)
parent6ebdebc0a5287bce18947fff3e7812bcac43ce36 (diff)
downloadtangerine-wallet-browser-427a10308309e7d4792878ce997728a9a25cb39b.tar.gz
tangerine-wallet-browser-427a10308309e7d4792878ce997728a9a25cb39b.tar.zst
tangerine-wallet-browser-427a10308309e7d4792878ce997728a9a25cb39b.zip
Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptor
Simplify Encryptor API Surface
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/keyring-controller-test.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index 437441e0e..a58043c7a 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -82,13 +82,16 @@ describe('KeyringController', function() {
})
- describe('#migrateAndGetKey', function() {
- it('should return the key for that password', function(done) {
- keyringController.migrateAndGetKey(password)
- .then((key) => {
- assert(key, 'a key is returned')
+ describe('#migrateOldVaultIfAny', function() {
+ it('should return and init a new vault', function(done) {
+ keyringController.migrateOldVaultIfAny(password)
+ .then(() => {
+ assert(keyringController.configManager.getVault(), 'now has a vault')
done()
})
+ .catch((reason) => {
+ assert.ifError(reason)
+ })
})
})