1 files changed, 15 insertions, 11 deletions
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index ee49d0901..764eae47c 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -1,11 +1,10 @@
+const reactTriggerChange = require('react-trigger-change')
 const PASSWORD = 'password123'
+const runMascaraFirstTimeTest = require('./mascara-first-time')
 
 QUnit.module('first time usage')
 
 QUnit.test('render init screen', (assert) => {
-  // intercept reload attempts
-  window.onbeforeunload = () => true
-
   const done = assert.async()
   runFirstTimeUsageTest(assert).then(done).catch((err) => {
     assert.notOk(err, `Error was thrown: ${err.stack}`)
@@ -14,10 +13,15 @@ QUnit.test('render init screen', (assert) => {
 })
 
 async function runFirstTimeUsageTest(assert, done) {
-  let waitTime = 0
-  if (window.METAMASK_PLATFORM_TYPE === 'mascara') waitTime = 4000
-  await timeout(waitTime)
+  if (window.METAMASK_PLATFORM_TYPE === 'mascara') {
+    return runMascaraFirstTimeTest(assert, done)
+  }
+
+  const selectState = $('select')
+  selectState.val('first time')
+  reactTriggerChange(selectState[0])
 
+  await timeout(2000)
   const app = $('#app-content')
 
   // recurse notices
@@ -41,8 +45,8 @@ async function runFirstTimeUsageTest(assert, done) {
   await timeout()
 
   // Scroll through terms
-  const title = app.find('h1').text()
-  assert.equal(title, 'MetaMask', 'title screen')
+  const title = app.find('h1')[0]
+  assert.equal(title.textContent, 'MetaMask', 'title screen')
 
   // enter password
   const pwBox = app.find('#password-box')[0]
@@ -78,9 +82,9 @@ async function runFirstTimeUsageTest(assert, done) {
 
   const menu = app.find('.menu-droppo')[0]
   const children = menu.children
-  const lock = children[children.length - 2]
-  assert.ok(lock, 'Lock menu item found')
-  lock.click()
+  const logout = children[2]
+  assert.ok(logout, 'Lock menu item found')
+  logout.click()
 
   await timeout(1000)