diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-30 07:16:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-30 07:16:24 +0800 |
commit | f8fbeb88ff6ae367b126dbe826e7613ea7c8a9ac (patch) | |
tree | 84db2e1733ccb7364c8309afea162f167b68b49b /test/integration/lib/keyring-controller-test.js | |
parent | da5be09a94763f5de292f47c425919f3d4fac866 (diff) | |
parent | 5bf1018d7540e0d89aa866e8d7f709e577bb99e3 (diff) | |
download | tangerine-wallet-browser-f8fbeb88ff6ae367b126dbe826e7613ea7c8a9ac.tar.gz tangerine-wallet-browser-f8fbeb88ff6ae367b126dbe826e7613ea7c8a9ac.tar.zst tangerine-wallet-browser-f8fbeb88ff6ae367b126dbe826e7613ea7c8a9ac.zip |
Merge pull request #896 from MetaMask/i893-DenodeifyKeyringController
Denodeify most of KeyringController
Diffstat (limited to 'test/integration/lib/keyring-controller-test.js')
-rw-r--r-- | test/integration/lib/keyring-controller-test.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/integration/lib/keyring-controller-test.js b/test/integration/lib/keyring-controller-test.js index 678744834..ae5ecc578 100644 --- a/test/integration/lib/keyring-controller-test.js +++ b/test/integration/lib/keyring-controller-test.js @@ -38,8 +38,8 @@ QUnit.test('keyringController:isInitialized', function (assert) { QUnit.test('keyringController:submitPassword', function (assert) { var done = assert.async() - this.keyringController.submitPassword(PASSWORD, (err, state) => { - assert.notOk(err) + this.keyringController.submitPassword(PASSWORD) + .then((state) => { assert.ok(state.identities[FIRST_ADDRESS]) done() }) @@ -49,9 +49,14 @@ QUnit.test('keyringController:setLocked', function (assert) { var done = assert.async() var self = this - this.keyringController.setLocked(function(err) { + this.keyringController.setLocked() + .then(function() { assert.notOk(self.keyringController.password, 'password should be deallocated') assert.deepEqual(self.keyringController.keyrings, [], 'keyrings should be deallocated') done() }) + .catch((reason) => { + assert.ifError(reason) + done() + }) }) |