fix merge conflicts

1 files changed, 8 insertions, 6 deletions

diff --git a/test/e2e/beta/helpers.js b/test/e2e/beta/helpers.js
index 828f87db7..73289e526 100644
--- a/test/e2e/beta/helpers.js
+++ b/test/e2e/beta/helpers.js
@@ -2,8 +2,8 @@ const fs = require('fs')
 const mkdirp = require('mkdirp')
 const pify = require('pify')
 const assert = require('assert')
-const {until} = require('selenium-webdriver')
 const { delay } = require('../func')
+const { until } = require('selenium-webdriver')
 
 module.exports = {
   assertElementNotPresent,
@@ -122,12 +122,14 @@ async function closeAllWindowHandlesExcept (driver, exceptions, windowHandles) {
 }
 
 async function assertElementNotPresent (webdriver, driver, by) {
+  let dataTab
   try {
-    const dataTab = await findElement(driver, by, 4000)
-    if (dataTab) {
-      assert(false, 'Data tab should not be present')
-    }
+    dataTab = await findElement(driver, by, 4000)
   } catch (err) {
-    assert(err instanceof webdriver.error.NoSuchElementError)
+    console.log(err)
+    assert(err instanceof webdriver.error.NoSuchElementError || err instanceof webdriver.error.TimeoutError)
+  }
+  if (dataTab) {
+    assert(false, 'Data tab should not be present')
   }
 }