1 files changed, 21 insertions, 33 deletions

diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js
index 5f270b52b..45a22f0b3 100644
--- a/test/e2e/beta/metamask-beta-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-ui.spec.js
@@ -4,24 +4,21 @@ const webdriver = require('selenium-webdriver')
 const { By, Key, until } = webdriver
 const {
   delay,
-  buildChromeWebDriver,
-  buildFirefoxWebdriver,
-  installWebExt,
-  getExtensionIdChrome,
-  getExtensionIdFirefox,
+  createModifiedTestBuild,
+  setupBrowserAndExtension,
+  verboseReportOnFailure,
 } = require('../func')
 const {
   findElement,
   findElements,
   checkBrowserForConsoleErrors,
-  loadExtension,
-  verboseReportOnFailure,
   openNewPage,
 } = require('./helpers')
 
 describe('MetaMask', function () {
-  let extensionId
+  const browser = process.env.SELENIUM_BROWSER
   let driver
+  let extensionUri
   let tokenAddress
 
   const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
@@ -33,27 +30,18 @@ describe('MetaMask', function () {
   this.bail(true)
 
   before(async function () {
-    switch (process.env.SELENIUM_BROWSER) {
-      case 'chrome': {
-        const extPath = path.resolve('dist/chrome')
-        driver = buildChromeWebDriver(extPath)
-        extensionId = await getExtensionIdChrome(driver)
-        await driver.get(`chrome-extension://${extensionId}/popup.html`)
-        break
-      }
-      case 'firefox': {
-        const extPath = path.resolve('dist/firefox')
-        driver = buildFirefoxWebdriver()
-        await installWebExt(driver, extPath)
-        await delay(700)
-        extensionId = await getExtensionIdFirefox(driver)
-        await driver.get(`moz-extension://${extensionId}/popup.html`)
-      }
-    }
+    const srcPath = path.resolve(`dist/${browser}`)
+    const { extPath } = await createModifiedTestBuild({ browser, srcPath })
+    const installResult = await setupBrowserAndExtension({ browser, extPath })
+    driver = installResult.driver
+    extensionUri = installResult.extensionUri
+
+    await driver.get(extensionUri)
+    await delay(tinyDelayMs)
   })
 
   afterEach(async function () {
-    if (process.env.SELENIUM_BROWSER === 'chrome') {
+    if (browser === 'chrome') {
       const errors = await checkBrowserForConsoleErrors(driver)
       if (errors.length) {
         const errorReports = errors.map(err => err.message)
@@ -62,7 +50,7 @@ describe('MetaMask', function () {
       }
     }
     if (this.currentTest.state === 'failed') {
-      await verboseReportOnFailure(driver, this.currentTest)
+      await verboseReportOnFailure({ browser, driver, title: this.currentTest.title })
     }
   })
 
@@ -79,7 +67,7 @@ describe('MetaMask', function () {
       try {
         networkSelector = await findElement(driver, By.css('#network_component'))
       } catch (e) {
-        await loadExtension(driver, extensionId)
+        await driver.get(extensionUri)
       }
       await delay(regularDelayMs)
     })
@@ -249,7 +237,7 @@ describe('MetaMask', function () {
         await word11.click()
         await delay(tinyDelayMs)
       } catch (e) {
-        await loadExtension(driver, extensionId)
+        await driver.get(extensionUri)
         await retypeSeedPhrase(words)
       }
     }
@@ -429,7 +417,7 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
 
       await driver.switchTo().window(extension)
-      await loadExtension(driver, extensionId)
+      await driver.get(extensionUri)
       await delay(regularDelayMs)
 
       const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`), 14000)
@@ -442,7 +430,7 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
       await driver.switchTo().window(extension)
       await delay(regularDelayMs)
-      await loadExtension(driver, extensionId)
+      await driver.get(extensionUri)
       await delay(regularDelayMs)
     })
   })
@@ -591,7 +579,7 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
 
       await driver.switchTo().window(extension)
-      await loadExtension(driver, extensionId)
+      await driver.get(extensionUri)
       await delay(regularDelayMs)
 
       const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`))
@@ -606,7 +594,7 @@ describe('MetaMask', function () {
 
       await driver.close()
       await driver.switchTo().window(extension)
-      await loadExtension(driver, extensionId)
+      await driver.get(extensionUri)
       await driver.switchTo().window(extension)
       await delay(regularDelayMs)