From 50c4db73cf7d8ce10dd985bdad6148525c666417 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Fri, 17 Jul 2020 21:06:29 -0230
Subject: [PATCH] Fix global-require issues (#8999)

---
 .eslintrc.js                     | 8 ++++++++
 test/helper.js                   | 5 +++--
 test/unit/migrations/026-test.js | 3 ++-
 test/unit/migrations/027-test.js | 3 ++-
 test/unit/migrations/028-test.js | 3 ++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e1b881802..98303eb24 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -44,6 +44,7 @@ module.exports = {
     /* TODO: Remove these when upgrading to `@metamask/eslint-config@2` */
     'array-callback-return': 'error',
     'callback-return': 'error',
+    'global-require': 'error',
     /* End v2 rules */
     'arrow-parens': 'error',
     'no-tabs': 'error',
@@ -105,6 +106,13 @@ module.exports = {
     rules: {
       'import/no-anonymous-default-export': ['error', { 'allowObject': true }],
     },
+  }, {
+    files: [
+      'app/scripts/migrations/*.js',
+    ],
+    rules: {
+      'global-require': 'off',
+    },
   }],
 
   settings: {
diff --git a/test/helper.js b/test/helper.js
index b608057bf..ea44bee48 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -3,6 +3,8 @@ import nock from 'nock'
 import Enzyme from 'enzyme'
 import Adapter from 'enzyme-adapter-react-16'
 import log from 'loglevel'
+import { JSDOM } from 'jsdom'
+
 
 nock.disableNetConnect()
 nock.enableNetConnect('localhost')
@@ -45,8 +47,6 @@ global.log = log
 //
 
 // dom
-const { JSDOM } = require('jsdom')
-
 const jsdom = new JSDOM()
 global.window = jsdom.window
 
@@ -87,5 +87,6 @@ if (!window.crypto) {
   window.crypto = {}
 }
 if (!window.crypto.getRandomValues) {
+  // eslint-disable-next-line global-require
   window.crypto.getRandomValues = require('polyfill-crypto.getrandomvalues')
 }
diff --git a/test/unit/migrations/026-test.js b/test/unit/migrations/026-test.js
index cb64346dd..83858c1c9 100644
--- a/test/unit/migrations/026-test.js
+++ b/test/unit/migrations/026-test.js
@@ -1,4 +1,5 @@
 import assert from 'assert'
+import firstTimeState from '../../../app/scripts/first-time-state'
 import migration26 from '../../../app/scripts/migrations/026'
 
 const oldStorage = {
@@ -32,7 +33,7 @@ describe('migration #26', function () {
   it('should successfully migrate first time state', function (done) {
     migration26.migrate({
       meta: {},
-      data: require('../../../app/scripts/first-time-state'),
+      data: firstTimeState,
     })
       .then((migratedData) => {
         assert.equal(migratedData.meta.version, migration26.version)
diff --git a/test/unit/migrations/027-test.js b/test/unit/migrations/027-test.js
index c8b947dcf..126a3b620 100644
--- a/test/unit/migrations/027-test.js
+++ b/test/unit/migrations/027-test.js
@@ -1,4 +1,5 @@
 import assert from 'assert'
+import firstTimeState from '../../../app/scripts/first-time-state'
 import migration27 from '../../../app/scripts/migrations/027'
 
 const oldStorage = {
@@ -42,7 +43,7 @@ describe('migration #27', function () {
   it('should successfully migrate first time state', function (done) {
     migration27.migrate({
       meta: {},
-      data: require('../../../app/scripts/first-time-state'),
+      data: firstTimeState,
     })
       .then((migratedData) => {
         assert.equal(migratedData.meta.version, migration27.version)
diff --git a/test/unit/migrations/028-test.js b/test/unit/migrations/028-test.js
index 1207b2734..dd58b8a42 100644
--- a/test/unit/migrations/028-test.js
+++ b/test/unit/migrations/028-test.js
@@ -1,4 +1,5 @@
 import assert from 'assert'
+import firstTimeState from '../../../app/scripts/first-time-state'
 import migration28 from '../../../app/scripts/migrations/028'
 
 const oldStorage = {
@@ -36,7 +37,7 @@ describe('migration #28', function () {
   it('should successfully migrate first time state', function (done) {
     migration28.migrate({
       meta: {},
-      data: require('../../../app/scripts/first-time-state'),
+      data: firstTimeState,
     })
       .then((migratedData) => {
         assert.equal(migratedData.meta.version, migration28.version)