WIP: Fix deep merge for container.append(). Use lodash.merge()

lib/command/definitions.js

@@ -206,9 +206,9 @@ module.exports = function (genPath, options) {
 
 function addAllMethodsInObject(supportObj, actions, methods, translations) {
   for (const action of methodsOfObject(supportObj)) {
-    let fn = supportObj[action];
+    const fn = supportObj[action];
     if (!fn.name) {
-      Object.defineProperty(fn, "name", {value: action});
+      Object.defineProperty(fn, 'name', { value: action });
     }
     const actionAlias = translations ? translations.actionAliasFor(action) : action;
     if (!actions[actionAlias]) {

lib/command/run-multiple.js

@@ -1,10 +1,7 @@
 const {
-  getConfig, getTestRoot, fail, deepMerge,
+  getConfig, getTestRoot, fail,
 } = require('./utils');
-const Codecept = require('../codecept');
-const Config = require('../config');
 const fork = require('child_process').fork;
-const output = require('../output');
 const path = require('path');
 const runHook = require('../hooks');
 const event = require('../event');

lib/command/run.js

@@ -1,13 +1,11 @@
 const getConfig = require('./utils').getConfig;
 const getTestRoot = require('./utils').getTestRoot;
-const deepMerge = require('./utils').deepMerge;
 const fileExists = require('../utils').fileExists;
 const path = require('path');
 const mkdirp = require('mkdirp');
 const Config = require('../config');
 const Codecept = require('../codecept');
 const output = require('../output');
-const event = require('../event');
 
 module.exports = function (test, options) {
   // registering options globally to use in config

lib/parser.js

@@ -87,7 +87,7 @@ function getParams(fn) {
     });
     return params;
   } catch (err) {
-    console.log('Error in ' + newFn.toString());
+    console.log(`Error in ${newFn.toString()}`);
     console.error(err);
   }
 }

lib/utils.js

@@ -20,17 +20,8 @@ function flatTail(flatParams, params) {
 module.exports.flatTail = flatTail;
 
 function deepMerge(target, source) {
-  if (isObject(target) && isObject(source)) {
-    for (const key in source) {
-      if (isObject(source[key])) {
-        if (!target[key]) Object.assign(target, { [key]: {} });
-        deepMerge(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
-    }
-  }
-  return target;
+  const merge = require('lodash.merge');
+  return merge(target, source);
 }
 
 module.exports.deepMerge = deepMerge;
@@ -40,7 +31,7 @@ const isGenerator = module.exports.isGenerator = function (fn) {
 };
 
 const isFunction = module.exports.isFunction = function (fn) {
-  return typeof fn === 'function'
+  return typeof fn === 'function';
 };
 
 const isAsyncFunction = module.exports.isAsyncFunction = function (fn) {

package.json

@@ -51,6 +51,7 @@
     "glob": "^6.0.1",
     "inquirer": "^6.2.1",
     "js-beautify": "^1.8.9",
+    "lodash.merge": "^4.6.1",
     "mkdirp": "^0.5.1",
     "mocha": "^4.1.0",
     "parse-function": "^5.2.10",