diff --git a/package.json b/package.json index addd4ead..52dc2182 100644 --- a/package.json +++ b/package.json @@ -180,7 +180,6 @@ "babel-loader": "^8.0.0", "babel-plugin-macros": "^2.2.1", "clean-css-loader": "^1.0.1", - "clear-module": "^3.0.0", "codegen.macro": "^3.0.0", "coveralls": "^3.0.0", "css-loader": "^1.0.0", diff --git a/test/common/util.js b/test/common/util.js index 2d60a5ee..c862647d 100644 --- a/test/common/util.js +++ b/test/common/util.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('tape'); -const clean = require('clear-module'); +const {reRequire} = require('mock-require'); const DIR = '../../'; const UtilPath = DIR + 'common/util'; const Util = require(UtilPath); @@ -136,9 +136,8 @@ test('util: escapeRegExp', (t) => { test('util: scope', (t) => { global.window = {}; - clean(UtilPath); - require(UtilPath); + reRequire(UtilPath); t.pass('should set window in scope'); diff --git a/test/server/columns.js b/test/server/columns.js index 9248d585..9869b239 100644 --- a/test/server/columns.js +++ b/test/server/columns.js @@ -2,33 +2,30 @@ const test = require('tape'); const fs = require('fs'); -const clean = require('clear-module'); +const {reRequire} = require('mock-require'); const columnsPath = '../../server/columns'; test('columns', (t) => { - clean(columnsPath); - const {NODE_ENV} = process.env; process.env.NODE_ENV = ''; - const columns = require(columnsPath); + const columns = reRequire(columnsPath); - t.equal(columns[''], '', 'should equal'); process.env.NODE_ENV = NODE_ENV; + t.equal(columns[''], '', 'should equal'); t.end(); }); test('columns: dev', (t) => { - clean(columnsPath); const {NODE_ENV} = process.env; process.env.NODE_ENV = 'development'; - const columns = require(columnsPath); + const columns = reRequire(columnsPath); const css = fs.readFileSync(`${__dirname}/../../css/columns/name-size-date.css`, 'utf8'); - t.equal(columns['name-size-date'], css, 'should equal'); process.env.NODE_ENV = NODE_ENV; + t.equal(columns['name-size-date'], css, 'should equal'); t.end(); });