mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #1079 from MetaMask/kumavis-refactor5
Refactor round 5
This commit is contained in:
commit
6df15177c8
@ -82,7 +82,6 @@ class KeyringController extends EventEmitter {
|
|||||||
keyrings: memState.keyrings,
|
keyrings: memState.keyrings,
|
||||||
// configManager
|
// configManager
|
||||||
seedWords: this.configManager.getSeedWords(),
|
seedWords: this.configManager.getSeedWords(),
|
||||||
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
|
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
currentFiat: this.configManager.getCurrentFiat(),
|
currentFiat: this.configManager.getCurrentFiat(),
|
||||||
conversionRate: this.configManager.getConversionRate(),
|
conversionRate: this.configManager.getConversionRate(),
|
||||||
conversionDate: this.configManager.getConversionDate(),
|
conversionDate: this.configManager.getConversionDate(),
|
||||||
|
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
"network": null,
|
"network": null,
|
||||||
"accounts": {},
|
"accounts": {},
|
||||||
"transactions": [],
|
"transactions": [],
|
||||||
"isDisclaimerConfirmed": true,
|
"isDisclaimerConfirmed": false,
|
||||||
"unconfMsgs": {},
|
"unconfMsgs": {},
|
||||||
"messages": [],
|
"messages": [],
|
||||||
"shapeShiftTxList": [],
|
"shapeShiftTxList": [],
|
||||||
|
@ -62,6 +62,7 @@ const controller = new MetamaskController({
|
|||||||
// initial state
|
// initial state
|
||||||
initState: firstTimeState,
|
initState: firstTimeState,
|
||||||
})
|
})
|
||||||
|
global.metamaskController = controller
|
||||||
|
|
||||||
//
|
//
|
||||||
// User Interface
|
// User Interface
|
||||||
|
@ -8,49 +8,49 @@ QUnit.test('agree to terms', function (assert) {
|
|||||||
|
|
||||||
wait().then(function() {
|
wait().then(function() {
|
||||||
app = $('iframe').contents().find('#app-content .mock-app-root')
|
app = $('iframe').contents().find('#app-content .mock-app-root')
|
||||||
app.find('.markdown').prop('scrollTop', 100000000)
|
|
||||||
return wait()
|
|
||||||
|
|
||||||
|
// Scroll through terms
|
||||||
|
var termsHeader = app.find('h3.terms-header')[0]
|
||||||
|
assert.equal(termsHeader.textContent, 'MetaMask Terms & Conditions', 'Showing TOS')
|
||||||
|
let termsPage = app.find('.markdown')[0]
|
||||||
|
assert.ok(termsPage, 'on terms page')
|
||||||
|
termsPage.scrollTop = termsPage.scrollHeight
|
||||||
|
|
||||||
|
return wait()
|
||||||
|
}).then(function() {
|
||||||
|
|
||||||
|
// Agree to terms
|
||||||
|
var button = app.find('button')[0]
|
||||||
|
button.click()
|
||||||
|
|
||||||
|
return wait()
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
|
|
||||||
var title = app.find('h1').text()
|
var title = app.find('h1').text()
|
||||||
assert.equal(title, 'MetaMask', 'title screen')
|
assert.equal(title, 'MetaMask', 'title screen')
|
||||||
|
|
||||||
|
// enter password
|
||||||
var pwBox = app.find('#password-box')[0]
|
var pwBox = app.find('#password-box')[0]
|
||||||
var confBox = app.find('#password-box-confirm')[0]
|
var confBox = app.find('#password-box-confirm')[0]
|
||||||
|
|
||||||
pwBox.value = PASSWORD
|
pwBox.value = PASSWORD
|
||||||
confBox.value = PASSWORD
|
confBox.value = PASSWORD
|
||||||
|
|
||||||
return wait()
|
return wait()
|
||||||
|
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
|
|
||||||
|
// create vault
|
||||||
var createButton = app.find('button.primary')[0]
|
var createButton = app.find('button.primary')[0]
|
||||||
createButton.click()
|
createButton.click()
|
||||||
|
|
||||||
return wait(1500)
|
return wait(1500)
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
|
|
||||||
var terms = app.find('h3.terms-header')[0]
|
|
||||||
assert.equal(terms.textContent, 'MetaMask Terms & Conditions', 'Showing TOS')
|
|
||||||
|
|
||||||
// Scroll through terms
|
|
||||||
var scrollable = app.find('.markdown')[0]
|
|
||||||
scrollable.scrollTop = scrollable.scrollHeight
|
|
||||||
|
|
||||||
return wait(10)
|
|
||||||
}).then(function() {
|
|
||||||
|
|
||||||
var button = app.find('button')[0] // Agree button
|
|
||||||
button.click()
|
|
||||||
|
|
||||||
return wait(1000)
|
|
||||||
}).then(function() {
|
|
||||||
|
|
||||||
var created = app.find('h3')[0]
|
var created = app.find('h3')[0]
|
||||||
assert.equal(created.textContent, 'Vault Created', 'Vault created screen')
|
assert.equal(created.textContent, 'Vault Created', 'Vault created screen')
|
||||||
|
|
||||||
var button = app.find('button')[0] // Agree button
|
// Agree button
|
||||||
|
var button = app.find('button')[0]
|
||||||
|
assert.ok(button, 'button present')
|
||||||
button.click()
|
button.click()
|
||||||
|
|
||||||
return wait(1000)
|
return wait(1000)
|
||||||
|
Loading…
Reference in New Issue
Block a user