aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-13 01:58:58 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-13 01:58:58 +0800
commit535d832a64daa4d87367cd29042554f77f4e3dc2 (patch)
tree890f2c40448d16bc07a0776349321378532e0512 /test
parentea1a934c7defe7e1b077b675ae9125118f1f3d87 (diff)
parentd67a5031c7f2b4cd14d3d27f3769a31769012f54 (diff)
downloadtangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.gz
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.bz2
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.lz
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.xz
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.zst
tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.zip
Merge branch 'master' into i328-MultiVault
Diffstat (limited to 'test')
-rw-r--r--test/integration/tests.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/test/integration/tests.js b/test/integration/tests.js
index a3f3cd294..92111b05b 100644
--- a/test/integration/tests.js
+++ b/test/integration/tests.js
@@ -4,12 +4,13 @@ QUnit.test('agree to terms', function (assert) {
// Select the mock app root
var app = $('iframe').contents().find('#app-content .mock-app-root')
- // Agree to terms
- app.find('button').click()
+ app.find('.markdown').prop('scrollTop', 100000000)
- // Wait for view to transition:
wait().then(function() {
-
+ app.find('button').click()
+ }).then(function() {
+ return wait()
+ }).then(function() {
var title = app.find('h1').text()
assert.equal(title, 'MetaMask', 'title screen')
@@ -18,4 +19,6 @@ QUnit.test('agree to terms', function (assert) {
done()
})
+
+ // Wait for view to transition:
})