Skip to content

Commit f382e35

Browse files
authored
fix up initialization of MergeDeep to account for ignorableFields (#612)
1 parent f0bea72 commit f382e35

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

lib/mergeDeep.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const NAME_USERNAME_PROPERTY = item => NAME_FIELDS.find(prop => Object.prototype
66
const GET_NAME_USERNAME_PROPERTY = item => { if (NAME_USERNAME_PROPERTY(item)) return item[NAME_USERNAME_PROPERTY(item)] }
77

88
class MergeDeep {
9-
constructor (log, github, ignorableFields, configvalidators = {}, overridevalidators = {}) {
9+
constructor (log, github, ignorableFields = [], configvalidators = {}, overridevalidators = {}) {
1010
this.log = log
1111
this.github = github
1212
this.ignorableFields = ignorableFields

test/unit/lib/mergeDeep.test.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,14 @@ entries:
820820
hasChanges: true
821821
}
822822
const ignorableFields = []
823-
const mergeDeep = new MergeDeep(log, ignorableFields)
823+
const mockReturnGitHubContext = jest.fn().mockReturnValue({
824+
request: () => {},
825+
});
826+
const mergeDeep = new MergeDeep(
827+
log,
828+
mockReturnGitHubContext,
829+
ignorableFields
830+
)
824831
const merged = mergeDeep.compareDeep(target, source)
825832
console.log(`diffs ${JSON.stringify(merged, null, 2)}`)
826833
expect(merged).toEqual(expected)

test/unit/lib/validator.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ describe('Validator Tests', () => {
113113

114114
try {
115115
const ignorableFields = []
116-
const mergeDeep = new MergeDeep(log, ignorableFields)
116+
const mergeDeep = new MergeDeep(log, {}, ignorableFields)
117117
mergeDeep.mergeDeep(baseconfig, overrideconfig)
118118
} catch (err) {
119119
expect(err).toBeDefined()
@@ -168,7 +168,7 @@ describe('Validator Tests', () => {
168168

169169
try {
170170
const ignorableFields = []
171-
const mergeDeep = new MergeDeep(log, ignorableFields)
171+
const mergeDeep = new MergeDeep(log, {}, ignorableFields)
172172
mergeDeep.mergeDeep(baseconfig, overrideconfig)
173173
} catch (err) {
174174
expect(err).toBeDefined()

0 commit comments

Comments
 (0)