aboutsummaryrefslogtreecommitdiffstats
path: root/test/integration/tests.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-10-13 04:03:15 +0800
committerGitHub <noreply@github.com>2016-10-13 04:03:15 +0800
commit88a68f732ee068d5f230708927207e3f84c43ad0 (patch)
tree5d0b967a582a7ef6e189834fccba5ede7e73101e /test/integration/tests.js
parenta1c3c944cf534fff8bfb9560347a03ba2a2bda00 (diff)
parentd67a5031c7f2b4cd14d3d27f3769a31769012f54 (diff)
downloadtangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.gz
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.bz2
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.lz
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.xz
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.zst
tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.zip
Merge branch 'master' into i695-dapp-reload
Diffstat (limited to 'test/integration/tests.js')
-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:
})