fix up initialization of MergeDeep to account for ignorableFields (#612)

github · May 15, 2024 · f382e35 · f382e35
1 parent f0bea72
commit f382e35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/mergeDeep.js b/lib/mergeDeep.js
@@ -6,7 +6,7 @@ const NAME_USERNAME_PROPERTY = item => NAME_FIELDS.find(prop => Object.prototype
 const GET_NAME_USERNAME_PROPERTY = item => { if (NAME_USERNAME_PROPERTY(item)) return item[NAME_USERNAME_PROPERTY(item)] }
 
 class MergeDeep {
-  constructor (log, github, ignorableFields, configvalidators = {}, overridevalidators = {}) {
+  constructor (log, github, ignorableFields = [], configvalidators = {}, overridevalidators = {}) {
     this.log = log
     this.github = github
     this.ignorableFields = ignorableFields

diff --git a/test/unit/lib/mergeDeep.test.js b/test/unit/lib/mergeDeep.test.js
@@ -820,7 +820,14 @@ entries:
       hasChanges: true
     }
     const ignorableFields = []
-    const mergeDeep = new MergeDeep(log, ignorableFields)
+    const mockReturnGitHubContext = jest.fn().mockReturnValue({
+      request: () => {},
+    });
+    const mergeDeep = new MergeDeep(
+      log,
+      mockReturnGitHubContext,
+      ignorableFields
+    )
     const merged = mergeDeep.compareDeep(target, source)
     console.log(`diffs ${JSON.stringify(merged, null, 2)}`)
     expect(merged).toEqual(expected)

diff --git a/test/unit/lib/validator.test.js b/test/unit/lib/validator.test.js
@@ -113,7 +113,7 @@ describe('Validator Tests', () => {
 
     try {
       const ignorableFields = []
-      const mergeDeep = new MergeDeep(log, ignorableFields)
+      const mergeDeep = new MergeDeep(log, {}, ignorableFields)
       mergeDeep.mergeDeep(baseconfig, overrideconfig)
     } catch (err) {
       expect(err).toBeDefined()
@@ -168,7 +168,7 @@ describe('Validator Tests', () => {
 
     try {
       const ignorableFields = []
-      const mergeDeep = new MergeDeep(log, ignorableFields)
+      const mergeDeep = new MergeDeep(log, {}, ignorableFields)
       mergeDeep.mergeDeep(baseconfig, overrideconfig)
     } catch (err) {
       expect(err).toBeDefined()