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

Made integration test create a first vault

Browse Source
This commit is contained in:
Dan Finlay 2016-11-30 14:43:18 -08:00
parent 5af4157363
commit 549bbfd05f
5 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
development/test.html Normal file
View File

@ -0,0 +1,31 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>MetaMask</title>
<script>
window.METAMASK_DEBUG = true
window.TEST_MODE = true
</script>
</head>
<body>
<!-- app content -->
<div id="app-content" style="height: 100%"></div>
<script src="./bundle.js" type="text/javascript" charset="utf-8"></script>
</body>
<style>
html, body, #app-content, .super-dev-container {
height: 100%;
width: 100%;
position: relative;
background: white;
}
.mock-app-root {
background: #F7F7F7;
}
</style>
</html>

4
test/integration/helpers.js
View File

@ -1,7 +1,7 @@
function wait() { function wait(time) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
setTimeout(function() { setTimeout(function() {
resolve() resolve()
}, 500) }, time || 500)
}) })
} }

2
test/integration/index.html
View File

@ -15,7 +15,7 @@
<script src="bundle.js"></script> <script src="bundle.js"></script>
<script src="/testem.js"></script> <script src="/testem.js"></script>
<iframe src="/development/index.html" height="500px" width="360px"> <iframe src="/development/test.html" height="500px" width="360px">
<p>Your browser does not support iframes</p> <p>Your browser does not support iframes</p>
</iframe> </iframe>
</body> </body>

22
test/integration/lib/first-time.js
View File

@ -1,3 +1,5 @@
const PASSWORD = 'password123'
QUnit.test('agree to terms', function (assert) { QUnit.test('agree to terms', function (assert) {
var done = assert.async() var done = assert.async()
let app let app
@ -6,10 +8,30 @@ QUnit.test('agree to terms', function (assert) {
app = $('iframe').contents().find('#app-content .mock-app-root') app = $('iframe').contents().find('#app-content .mock-app-root')
app.find('.markdown').prop('scrollTop', 100000000) app.find('.markdown').prop('scrollTop', 100000000)
return wait() 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')
var pwBox = app.find('#password-box')[0]
var confBox = app.find('#password-box-confirm')[0]
pwBox.value = PASSWORD
confBox.value = PASSWORD
return wait()
}).then(function() {
var createButton = app.find('button.primary')[0]
createButton.click()
return wait(1500)
}).then(function() {
var terms = app.find('h3.terms-header')[0]
assert.equal(terms.textContent, 'MetaMask Terms & Conditions', 'Showing TOS')
done() done()
}) })
}) })

3
ui/app/actions.js
View File

@ -204,10 +204,11 @@ function createNewVaultAndRestore (password, seed) {
function createNewVaultAndKeychain (password) { function createNewVaultAndKeychain (password) {
return (dispatch) => { return (dispatch) => {
background.createNewVaultAndKeychain(password, (err) => { background.createNewVaultAndKeychain(password, (err, newState) => {
if (err) { if (err) {
return dispatch(actions.showWarning(err.message)) return dispatch(actions.showWarning(err.message))
} }
dispatch(actions.updateMetamaskState(newState))
}) })
} }
} }