diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 09:55:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 09:55:22 +0800 |
commit | ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20 (patch) | |
tree | 5c2f426a63e22f4abc378a59bb86faba7e002877 /test | |
parent | 427a10308309e7d4792878ce997728a9a25cb39b (diff) | |
parent | 05c8658ff343af61b1a40a5624ecba77adb2ef00 (diff) | |
download | tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.gz tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.zst tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.zip |
Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor
Fix new encryptor implementation
Diffstat (limited to 'test')
-rw-r--r-- | test/integration/lib/keyring-controller-test.js | 11 | ||||
-rw-r--r-- | test/unit/keyring-controller-test.js | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/test/integration/lib/keyring-controller-test.js b/test/integration/lib/keyring-controller-test.js index bea485270..678744834 100644 --- a/test/integration/lib/keyring-controller-test.js +++ b/test/integration/lib/keyring-controller-test.js @@ -44,3 +44,14 @@ QUnit.test('keyringController:submitPassword', function (assert) { done() }) }) + +QUnit.test('keyringController:setLocked', function (assert) { + var done = assert.async() + var self = this + + this.keyringController.setLocked(function(err) { + assert.notOk(self.keyringController.password, 'password should be deallocated') + assert.deepEqual(self.keyringController.keyrings, [], 'keyrings should be deallocated') + done() + }) +}) diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js index a58043c7a..b20def02e 100644 --- a/test/unit/keyring-controller-test.js +++ b/test/unit/keyring-controller-test.js @@ -87,6 +87,7 @@ describe('KeyringController', function() { keyringController.migrateOldVaultIfAny(password) .then(() => { assert(keyringController.configManager.getVault(), 'now has a vault') + assert(keyringController.password, 'has a password set') done() }) .catch((reason) => { |