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

feature/default_network_editable
kumavis 8 years ago
commit f9e09d2300
  1. 2
      test/unit/keyring-controller-test.js

@ -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]) } },

Loading…
Cancel
Save