aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-03-31 09:55:43 +0800
committerkumavis <aaron@kumavis.me>2017-03-31 09:55:43 +0800
commitf9e09d23002c38bc441e5216304883ccb1c3d6df (patch)
treed1681c3ae38dfbb89eb607d9b5619d80aaa7bc55
parent6259ffaef4f2045d2de069ea83de47b64b5fba86 (diff)
parent242ba6e0ecc8628288ca5a80c8c6183675030b1b (diff)
downloadtangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar.gz
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar.bz2
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar.lz
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar.xz
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.tar.zst
tangerine-wallet-browser-f9e09d23002c38bc441e5216304883ccb1c3d6df.zip
Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform
-rw-r--r--test/unit/keyring-controller-test.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index aae4cdfd6..efd0a3546 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -135,7 +135,7 @@ describe('KeyringController', function() {
})
describe('#getAccounts', function() {
- it('returns the result of getAccounts for each keyring', function() {
+ it('returns the result of getAccounts for each keyring', function(done) {
keyringController.keyrings = [
{ getAccounts() { return Promise.resolve([1,2,3]) } },
{ getAccounts() { return Promise.resolve([4,5,6]) } },