diff --git a/development/test.html b/development/test.html
new file mode 100644
index 000000000..702be7fa0
--- /dev/null
+++ b/development/test.html
@@ -0,0 +1,31 @@
+
+
+
+
+ MetaMask
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/integration/helpers.js b/test/integration/helpers.js
index 95c36017a..40f78d701 100644
--- a/test/integration/helpers.js
+++ b/test/integration/helpers.js
@@ -1,7 +1,7 @@
-function wait() {
+function wait(time) {
return new Promise(function(resolve, reject) {
setTimeout(function() {
resolve()
- }, 500)
+ }, time || 500)
})
}
diff --git a/test/integration/index.html b/test/integration/index.html
index ad4b4eb14..8a54cb829 100644
--- a/test/integration/index.html
+++ b/test/integration/index.html
@@ -15,7 +15,7 @@
-
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index a73b0cba3..e7d4ffaa2 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -1,3 +1,5 @@
+const PASSWORD = 'password123'
+
QUnit.test('agree to terms', function (assert) {
var done = assert.async()
let app
@@ -6,10 +8,30 @@ QUnit.test('agree to terms', function (assert) {
app = $('iframe').contents().find('#app-content .mock-app-root')
app.find('.markdown').prop('scrollTop', 100000000)
return wait()
+
}).then(function() {
+
var title = app.find('h1').text()
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()
})
})
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 8f37b2e4c..d800091f2 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -204,10 +204,11 @@ function createNewVaultAndRestore (password, seed) {
function createNewVaultAndKeychain (password) {
return (dispatch) => {
- background.createNewVaultAndKeychain(password, (err) => {
+ background.createNewVaultAndKeychain(password, (err, newState) => {
if (err) {
return dispatch(actions.showWarning(err.message))
}
+ dispatch(actions.updateMetamaskState(newState))
})
}
}