1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform

This commit is contained in:
kumavis 2017-03-30 18:55:43 -07:00
commit f9e09d2300

View File

@ -135,7 +135,7 @@ describe('KeyringController', function() {
}) })
describe('#getAccounts', 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 = [ keyringController.keyrings = [
{ getAccounts() { return Promise.resolve([1,2,3]) } }, { getAccounts() { return Promise.resolve([1,2,3]) } },
{ getAccounts() { return Promise.resolve([4,5,6]) } }, { getAccounts() { return Promise.resolve([4,5,6]) } },