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

Cleanup.

Browse Source
This commit is contained in:
Kevin Serrano 2016-10-11 15:50:02 -07:00
parent f7361d9654
commit 5e9bc31c58
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,8 +341,6 @@ module.exports = class MetamaskController {
} }
} }
// called from popup // called from popup
setRpcTarget (rpcTarget) { setRpcTarget (rpcTarget) {
this.configManager.setRpcTarget(rpcTarget) this.configManager.setRpcTarget(rpcTarget)

32
test/integration/tests.js
View File

@ -3,25 +3,37 @@ QUnit.test('agree to terms', function (assert) {
// Select the mock app root // Select the mock app root
var app = $('iframe').contents().find('#app-content .mock-app-root') var app = $('iframe').contents().find('#app-content .mock-app-root')
// var button = $('.agree')
// button.removeAttr('disabled')
app.find('.markdown').prop('scrollTop', 100000000) app.find('.markdown').prop('scrollTop', 100000000)
// Agree to terms // Agree to terms
// wait().then(function() {
// app.find('button').click()
// wait().then(function() {
//
// var title = app.find('h1').text()
// assert.equal(title, 'MetaMask', 'title screen')
//
// var buttons = app.find('button')
// assert.equal(buttons.length, 2, 'two buttons: create and restore')
//
// done()
// })
// })
wait().then(function() { wait().then(function() {
app.find('button').click() app.find('button').click()
wait().then(function() { }).then(function() {
return wait()
}).then(function() {
var title = app.find('h1').text()
assert.equal(title, 'MetaMask', 'title screen')
var title = app.find('h1').text() var buttons = app.find('button')
assert.equal(title, 'MetaMask', 'title screen') assert.equal(buttons.length, 2, 'two buttons: create and restore')
var buttons = app.find('button') done()
assert.equal(buttons.length, 2, 'two buttons: create and restore')
done()
})
}) })
// Wait for view to transition: // Wait for view to transition:

3
ui/app/account-detail.js
View File

@ -44,6 +44,9 @@ AccountDetailScreen.prototype.render = function () {
var props = this.props var props = this.props
var selected = props.address || Object.keys(props.accounts)[0] var selected = props.address || Object.keys(props.accounts)[0]
var identity = props.identities[selected] var identity = props.identities[selected]
console.log(props)
console.log(selected)
console.log(identity)
var account = props.accounts[selected] var account = props.accounts[selected]
const { network } = props const { network } = props

2
ui/app/first-time/disclaimer.js
View File

@ -92,7 +92,7 @@ DisclaimerScreen.prototype.render = function () {
h('button', { h('button', {
style: { marginTop: '18px' }, style: { marginTop: '18px' },
disabled: disabled, disabled,
onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
}, disabled ? 'Scroll Down to Enable' : 'I Agree'), }, disabled ? 'Scroll Down to Enable' : 'I Agree'),
]) ])