From 21119dadc6a950f7e20dee6f41add38aefb64817 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Tue, 17 Nov 2020 14:37:19 -0500
Subject: [PATCH] Finish

---
 extension/.eslintignore                  |  1 -
 extension/jest.config.js                 |  2 +-
 extension/package.json                   |  2 +-
 extension/test/chrome/extension.spec.js  | 10 ++++------
 extension/test/chrome/setup.js           |  2 --
 extension/test/electron/devpanel.spec.js | 10 ++++------
 extension/test/electron/setup.js         |  2 --
 extension/test/{app => }/setup.js        |  0
 8 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 extension/test/chrome/setup.js
 delete mode 100644 extension/test/electron/setup.js
 rename extension/test/{app => }/setup.js (100%)

diff --git a/extension/.eslintignore b/extension/.eslintignore
index 4a232330..85ffff06 100644
--- a/extension/.eslintignore
+++ b/extension/.eslintignore
@@ -3,6 +3,5 @@ build
 dev
 webpack/replace
 examples
-test/app/setup.js
 npm-package
 _book
diff --git a/extension/jest.config.js b/extension/jest.config.js
index 7db7d578..9de297e2 100644
--- a/extension/jest.config.js
+++ b/extension/jest.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  setupFiles: ['<rootDir>/test/app/setup.js'],
+  setupFiles: ['<rootDir>/test/setup.js'],
 };
diff --git a/extension/package.json b/extension/package.json
index 4a9bd28f..8ef1aa2b 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -18,7 +18,7 @@
     "docs:publish": "npm run docs:clean && npm run docs:build && cd _book && git init && git commit --allow-empty -m 'update book' && git checkout -b gh-pages && touch .nojekyll && git add . && git commit -am 'update book' && git push git@github.com:zalmoxisus/redux-devtools-extension gh-pages --force",
     "clean": "rimraf build/ && rimraf dev/",
     "lint": "eslint .",
-    "test:app": "jest test/app",
+    "test:app": "cross-env BABEL_ENV=test jest test/app",
     "test:chrome": "jest test/chrome",
     "test:electron": "jest test/electron && rimraf test/electron/tmp",
     "test": "npm run test:app && npm run build:extension && npm run test:chrome && npm run test:electron"
diff --git a/extension/test/chrome/extension.spec.js b/extension/test/chrome/extension.spec.js
index f2823d2a..0f1845f1 100644
--- a/extension/test/chrome/extension.spec.js
+++ b/extension/test/chrome/extension.spec.js
@@ -9,9 +9,7 @@ const extensionId = 'lmhkpmbekcpmknklioeibfkpmmfibljd';
 const actionsPattern = /^@@INIT(.|\n)+@@reduxReactRouter\/routerDidChange(.|\n)+@@reduxReactRouter\/initRoutes(.|\n)+$/;
 
 describe('Chrome extension', function () {
-  this.timeout(20000);
-
-  before(async () => {
+  beforeAll(async () => {
     chromedriver.start();
     await delay(2000);
     this.driver = new webdriver.Builder()
@@ -24,7 +22,7 @@ describe('Chrome extension', function () {
       .forBrowser('chrome')
       .build();
   });
-  after(async () => {
+  afterAll(async () => {
     await this.driver.quit();
     chromedriver.stop();
   });
@@ -41,10 +39,10 @@ describe('Chrome extension', function () {
   });
 
   it("should contain inspector monitor's component", async () => {
-    const val = this.driver
+    const val = await this.driver
       .findElement(webdriver.By.xpath('//div[contains(@class, "inspector-")]'))
       .getText();
-    expect(val).toExist();
+    expect(val).toBeDefined();
   });
 
   it('should contain an empty actions list', async () => {
diff --git a/extension/test/chrome/setup.js b/extension/test/chrome/setup.js
deleted file mode 100644
index 3ebb381d..00000000
--- a/extension/test/chrome/setup.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('@babel/register')();
-require('@babel/polyfill');
diff --git a/extension/test/electron/devpanel.spec.js b/extension/test/electron/devpanel.spec.js
index 66889cb9..0974d021 100644
--- a/extension/test/electron/devpanel.spec.js
+++ b/extension/test/electron/devpanel.spec.js
@@ -8,9 +8,7 @@ const port = 9515;
 const devPanelPath = 'chrome-extension://redux-devtools/devpanel.html';
 
 describe('DevTools panel for Electron', function () {
-  this.timeout(10000);
-
-  before(async () => {
+  beforeAll(async () => {
     chromedriver.start();
     await delay(1000);
     this.driver = new webdriver.Builder()
@@ -26,7 +24,7 @@ describe('DevTools panel for Electron', function () {
     await this.driver.manage().timeouts().setScriptTimeout(10000);
   });
 
-  after(async () => {
+  afterAll(async () => {
     await this.driver.quit();
     chromedriver.stop();
   });
@@ -61,7 +59,7 @@ describe('DevTools panel for Electron', function () {
     const className = await this.driver
       .findElement(webdriver.By.className(id))
       .getAttribute('class');
-    expect(className).toNotMatch(/hidden/); // not hidden
+    expect(className).not.toMatch(/hidden/); // not hidden
   });
 
   it('should have Redux DevTools UI on current tab', async () => {
@@ -91,7 +89,7 @@ describe('DevTools panel for Electron', function () {
     const val = await this.driver
       .findElement(webdriver.By.xpath('//div[contains(@class, "inspector-")]'))
       .getText();
-    expect(val).toExist();
+    expect(val).toBeDefined();
   });
 
   Object.keys(switchMonitorTests).forEach((description) =>
diff --git a/extension/test/electron/setup.js b/extension/test/electron/setup.js
deleted file mode 100644
index 3ebb381d..00000000
--- a/extension/test/electron/setup.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('@babel/register')();
-require('@babel/polyfill');
diff --git a/extension/test/app/setup.js b/extension/test/setup.js
similarity index 100%
rename from extension/test/app/setup.js
rename to extension/test/setup.js