aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-09-12 13:34:16 +0800
committerkumavis <aaron@kumavis.me>2017-09-12 13:34:16 +0800
commit48d21f4fca75e1f012ee881eb741a703051ee338 (patch)
tree58b32c63a6c5438fdcffd09ddf699465a5c2cef4
parent0e70366e9c31d3085d505f110b586418c72c217e (diff)
downloadtangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar.gz
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar.bz2
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar.lz
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar.xz
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.tar.zst
tangerine-wallet-browser-48d21f4fca75e1f012ee881eb741a703051ee338.zip
tests - integration - fix bad cherry-pick
-rw-r--r--test/integration/lib/first-time.js23
1 files changed, 7 insertions, 16 deletions
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index c5ecfef95..38a94e551 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -5,13 +5,11 @@ QUnit.module('first time usage')
QUnit.test('render init screen', (assert) => {
const done = assert.async()
runFirstTimeUsageTest(assert).then(done).catch((err) => {
- assert.notOk(err, 'Should not error')
+ assert.notOk(err, `Error was thrown: ${err.stack}`)
done()
})
})
-<<<<<<< HEAD
-=======
// QUnit.testDone(({ module, name, total, passed, failed, skipped, todo, runtime }) => {
// if (failed > 0) {
// const app = $('iframe').contents()[0].documentElement
@@ -20,36 +18,29 @@ QUnit.test('render init screen', (assert) => {
// }
// })
->>>>>>> 5c53bab... test - integration - drop testem for karma
async function runFirstTimeUsageTest(assert, done) {
await timeout()
const app = $('#app-content .mock-app-root')
- const recurseNotices = async () => {
+ // recurse notices
+ while (true) {
const button = app.find('button')
if (button.html() === 'Accept') {
+ // still notices to accept
const termsPage = app.find('.markdown')[0]
termsPage.scrollTop = termsPage.scrollHeight
await timeout()
button.click()
-<<<<<<< HEAD
- await wait()
- await recurseNotices()
-=======
await timeout()
->>>>>>> 5c53bab... test - integration - drop testem for karma
} else {
- await wait()
+ // exit loop
+ break
}
}
-<<<<<<< HEAD
- await recurseNotices()
-=======
await timeout()
->>>>>>> 5c53bab... test - integration - drop testem for karma
// Scroll through terms
const title = app.find('h1').text()
@@ -144,4 +135,4 @@ function timeout(time) {
resolve()
}, time * 3 || 1500)
})
-}
+} \ No newline at end of file