Merge pull request #625 from yuya-oc/fix-ci

Fix an issue where the combination of deepmerge and webpack breaks tests

src/common/deepmerge.js

@@ -0,0 +1,10 @@
+const deepmerge = require('deepmerge');
+
+function deepMergeProxy(x, y, options) {
+  if (process.env.TEST) {
+    return deepmerge(x, y, options);
+  }
+  return deepmerge.default(x, y, options); // due to webpack conversion
+}
+
+module.exports = deepMergeProxy;

src/common/settings.js

@@ -3,10 +3,7 @@
 const fs = require('fs');
 
 const path = require('path');
-let deepmerge = require('deepmerge').default;
-if (process.env.TEST) {
-  deepmerge = require('deepmerge'); // eslint-disable-line
-}
+const deepmerge = require('./deepmerge');
 
 const settingsVersion = 1;
 const baseConfig = require('./config/base.json');

test/modules/environment.js

@@ -1,5 +1,4 @@
 'use strict';
-process.env.TEST = 'test';
 
 const chai = require('chai');
 chai.should();

test/specs/settings_test.js

@@ -2,6 +2,14 @@ const settings = require('../../src/common/settings');
 const deepmerge = require('deepmerge');
 
 describe('common/settings.js', () => {
+  before(() => {
+    process.env.TEST = 1;
+  });
+
+  after(() => {
+    delete process.env.TEST;
+  });
+
   it('should upgrade v0 config file', () => {
     const v0Config = {
       url: 'https://example.com/team'