development - ci-screens - remove mocha wrapper that was losing exit code

3 files changed, 12 insertions, 117 deletions

diff --git a/package.json b/package.json
index 51f481b36..72abebba0 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test:e2e": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run'",
     "test:e2e:run": "mocha test/e2e/metamask.spec --recursive",
     "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
-    "test:screens:run": "mocha test/screens/new.spec --recursive",
+    "test:screens:run": "node test/screens/new-ui.js",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
diff --git a/test/screens/new.spec.js b/test/screens/new-ui.js
index 43490226b..b23260a7c 100644
--- a/test/screens/new.spec.js
+++ b/test/screens/new-ui.js
@@ -214,16 +214,16 @@ async function captureAllScreens() {
     await pify(endOfStream)(stream)
   }
 
-  async function verboseReportOnFailure(test) {
-    const artifactDir = `./test-artifacts/${test.title}`
-    const filepathBase = `${artifactDir}/test-failure`
-    await pify(mkdirp)(artifactDir)
-    // capture screenshot
-    const screenshot = await driver.takeScreenshot()
-    await pify(fs.writeFile)(`${filepathBase}-screenshot.png`, screenshot, { encoding: 'base64' })
-    // capture dom source
-    const htmlSource = await driver.getPageSource()
-    await pify(fs.writeFile)(`${filepathBase}-dom.html`, htmlSource)
-  }
+}
 
+async function verboseReportOnFailure(test) {
+  const artifactDir = `./test-artifacts/${test.title}`
+  const filepathBase = `${artifactDir}/test-failure`
+  await pify(mkdirp)(artifactDir)
+  // capture screenshot
+  const screenshot = await driver.takeScreenshot()
+  await pify(fs.writeFile)(`${filepathBase}-screenshot.png`, screenshot, { encoding: 'base64' })
+  // capture dom source
+  const htmlSource = await driver.getPageSource()
+  await pify(fs.writeFile)(`${filepathBase}-dom.html`, htmlSource)
 }
diff --git a/test/screens/old.spec.js b/test/screens/old.spec.js
deleted file mode 100644
index 87399d4b5..000000000
--- a/test/screens/old.spec.js
+++ /dev/null
@@ -1,105 +0,0 @@
-const path = require('path')
-const fs = require('fs')
-const pify = require('pify')
-const mkdirp = require('mkdirp')
-const webdriver = require('selenium-webdriver')
-const By = webdriver.By
-const { delay, buildWebDriver } = require('./func')
-
-captureAllScreens().catch(console.error)
-
-async function captureAllScreens() {
-  // setup selenium and install extension
-  const extPath = path.resolve('dist/chrome')
-  const driver = buildWebDriver(extPath)
-  await driver.get('chrome://extensions-frame')
-  const elems = await driver.findElements(By.css('.extension-list-item-wrapper'))
-  const extensionId = await elems[1].getAttribute('id')
-  await driver.get(`chrome-extension://${extensionId}/popup.html`)
-  await delay(500)
-  const tabs = await driver.getAllWindowHandles()
-  await driver.switchTo().window(tabs[0])
-  await delay(300)
-
-  // common names
-  let button
-
-  await captureScreenShot('privacy')
-
-  const privacy = await driver.findElement(By.css('.terms-header')).getText()
-  driver.findElement(By.css('button')).click()
-  await delay(300)
-  await captureScreenShot('terms')
-
-  await delay(300)
-  const terms = await driver.findElement(By.css('.terms-header')).getText()
-  await delay(300)
-  const element = driver.findElement(By.linkText('Attributions'))
-  await driver.executeScript('arguments[0].scrollIntoView(true)', element)
-  await delay(300)
-  button = await driver.findElement(By.css('button'))
-  const buttonEnabled = await button.isEnabled()
-  await delay(500)
-  await captureScreenShot('terms-scrolled')
-
-  await button.click()
-  await delay(300)
-  await captureScreenShot('choose-password')
-
-  const passwordBox = await driver.findElement(By.id('password-box'))
-  const passwordBoxConfirm = await driver.findElement(By.id('password-box-confirm'))
-  button = driver.findElement(By.css('button'))
-  passwordBox.sendKeys('123456789')
-  passwordBoxConfirm.sendKeys('123456789')
-  await delay(500)
-  await captureScreenShot('choose-password-filled')
-
-  await button.click()
-  await delay(700)
-  this.seedPhase = await driver.findElement(By.css('.twelve-word-phrase')).getText()
-  await captureScreenShot('seed phrase')
-
-  const continueAfterSeedPhrase = await driver.findElement(By.css('button'))
-  await continueAfterSeedPhrase.click()
-  await delay(300)
-  await captureScreenShot('main screen')
-
-  await driver.findElement(By.css('.sandwich-expando')).click()
-  await delay(500)
-  await captureScreenShot('menu')
-
-  // await driver.findElement(By.css('#app-content > div > div:nth-child(3) > span > div > li:nth-child(3)')).click()
-  // await captureScreenShot('main screen')
-  // it('should accept account password after lock', async () => {
-  //   await delay(500)
-  //   await driver.findElement(By.id('password-box')).sendKeys('123456789')
-  //   await driver.findElement(By.css('button')).click()
-  //   await delay(500)
-  // })
-  //
-  // it('should show QR code option', async () => {
-  //   await delay(300)
-  //   await driver.findElement(By.css('.fa-ellipsis-h')).click()
-  //   await driver.findElement(By.css('#app-content > div > div.app-primary.from-right > div > div > div:nth-child(1) > flex-column > div.name-label > div > span > i > div > div > li:nth-child(3)')).click()
-  //   await delay(300)
-  // })
-  //
-  // it('should show the account address', async () => {
-  //   this.accountAddress = await driver.findElement(By.css('.ellip-address')).getText()
-  //   await driver.findElement(By.css('.fa-arrow-left')).click()
-  //   await delay(500)
-  // })
-
-  // cleanup
-  await driver.quit()
-
-  async function captureScreenShot(label) {
-    const artifactDir = `./test-artifacts/${label}`
-    const filepathBase = `${artifactDir}`
-    await pify(mkdirp)(artifactDir)
-    // capture screenshot
-    const screenshot = await driver.takeScreenshot()
-    await pify(fs.writeFile)(`${filepathBase}/screenshot.png`, screenshot, { encoding: 'base64' })
-  }
-
-}