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

fixed unit tests

Browse Source
This commit is contained in:
brunobar79 2018-08-14 21:19:01 -04:00
parent 53dcad5a3b
commit fdf202efb0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/metamask-controller.js
View File

@ -551,15 +551,21 @@ module.exports = class MetamaskController extends EventEmitter {
default:
throw new Error('MetamaskController:getKeyringForDevice - Unknown device')
}
console.log('getting keyring for device ', deviceName, hdPath)
let keyring = await this.keyringController.getKeyringsByType(keyringName)[0]
console.log('got Keyring', keyring)
if (!keyring) {
console.log('we did not so lets add it', keyringName)
keyring = await this.keyringController.addNewKeyring(keyringName)
console.log('what about now', keyring)
}
console.log('setting hdPath', hdPath)
if (hdPath && keyring.setHdPath) {
keyring.setHdPath(hdPath)
}
keyring.network = this.networkController.getProviderConfig().type
console.log('setting network', keyring.network)
return keyring

14
test/unit/app/controllers/metamask-controller-test.js
View File

@ -315,16 +315,20 @@ describe('MetaMaskController', function () {
sinon.spy(metamaskController.preferencesController, 'setAddresses')
sinon.spy(metamaskController.preferencesController, 'setSelectedAddress')
sinon.spy(metamaskController.preferencesController, 'setAccountLabel')
await metamaskController.connectHardware('trezor', 0, `m/44/0'/0'`)
await metamaskController.unlockHardwareWalletAccount('trezor', accountToUnlock, `m/44/0'/0'`)
await metamaskController.connectHardware('trezor', 0, `m/44/0'/0'`).catch((e) => null)
await metamaskController.unlockHardwareWalletAccount(accountToUnlock, 'trezor', `m/44/0'/0'`)
})
afterEach(function () {
metamaskController.keyringController.addNewAccount.restore()
window.open.restore()
metamaskController.keyringController.addNewAccount.restore()
metamaskController.keyringController.getAccounts.restore()
metamaskController.preferencesController.setAddresses.restore()
metamaskController.preferencesController.setSelectedAddress.restore()
metamaskController.preferencesController.setAccountLabel.restore()
})
it('should set accountToUnlock in the keyring', async function () {
it('should set unlockedAccount in the keyring', async function () {
const keyrings = await metamaskController.keyringController.getKeyringsByType(
'Trezor Hardware'
)
@ -332,7 +336,7 @@ describe('MetaMaskController', function () {
})
it('should call keyringController.addNewAccount', async function () {
it('should call keyringController.addNewAccount', async function () {
assert(metamaskController.keyringController.addNewAccount.calledOnce)
})