Merge pull request #1835 from MetaMask/NewUI

Begin UI Refactor with Responsiveness & New Menus

2 files changed, 22 insertions, 20 deletions

diff --git a/test/integration/index.js b/test/integration/index.js
index 85f91d92b..e089fc39b 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -1,23 +1,19 @@
-var fs = require('fs')
-var path = require('path')
-var browserify = require('browserify')
-var tests = fs.readdirSync(path.join(__dirname, 'lib'))
-var bundlePath = path.join(__dirname, 'bundle.js')
+const fs = require('fs')
+const path = require('path')
+const browserify = require('browserify')
+const tests = fs.readdirSync(path.join(__dirname, 'lib'))
+const bundlePath = path.join(__dirname, 'bundle.js')
 
-var b = browserify()
+const b = browserify()
 
-// Remove old bundle
-try {
-  fs.unlinkSync(bundlePath)
+const writeStream = fs.createWriteStream(bundlePath)
 
-  var writeStream = fs.createWriteStream(bundlePath)
-
-  tests.forEach(function (fileName) {
-    b.add(path.join(__dirname, 'lib', fileName))
-  })
-
-  b.bundle().pipe(writeStream)
-} catch (e) {
-  console.error('Integration build failure', e)
-}
+tests.forEach(function (fileName) {
+  b.add(path.join(__dirname, 'lib', fileName))
+})
 
+b.bundle()
+.pipe(writeStream)
+.on('error', (err) => {
+  throw err
+})
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 6c8cedbac..0e4b802da 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -90,7 +90,13 @@ QUnit.test('render init screen', function (assert) {
     return wait()
   }).then(function (){
 
-    var qrButton = app.find('.fa.fa-qrcode')[0]
+    var qrButton = app.find('.fa.fa-ellipsis-h')[0] // open account settings dropdown
+    qrButton.click()
+
+    return wait(1000)
+  }).then(function (){
+
+    var qrButton = app.find('.dropdown-menu-item')[1] // qr code item
     qrButton.click()
 
     return wait(1000)