RELEASING: Releasing 2 package(s) #23
Annotations
7 errors
publish
Process completed with exit code 1.
|
src/merger.test.ts > mergeObject > records SKIP as conflict:
lib/src/merger.ts#L182
TypeError: Cannot read properties of undefined (reading 'debug')
❯ Module.mergeObject src/merger.ts:182:10
❯ src/merger.test.ts:133:21
|
src/merger.test.ts > mergeObject > applies strategy OK result:
lib/src/merger.ts#L182
TypeError: Cannot read properties of undefined (reading 'debug')
❯ Module.mergeObject src/merger.ts:182:10
❯ src/merger.test.ts:125:21
|
src/merger.test.ts > BuiltInStrategies > merge plain objects recurses:
lib/src/merger.ts#L182
TypeError: Cannot read properties of undefined (reading 'debug')
❯ mergeObject src/merger.ts:182:10
❯ Object.merge src/merger.ts:117:29
❯ src/merger.test.ts:100:39
|
src/merge-processor.test.ts > resolveGitMergeFiles > enables debug logging when configured:
lib/src/merge-processor.test.ts#L256
AssertionError: expected "spy" to be called with arguments: [ 'git-merge', …(1) ]
Number of calls: 0
❯ src/merge-processor.test.ts:256:29
|
src/merge-processor.test.ts > processMerge > processes successful merge without conflicts:
lib/src/merge-processor.test.ts#L70
AssertionError: expected "mergeObject" to be called with arguments: [ { ours: { a: 1 }, …(6) } ]
Received:
1st mergeObject call:
@@ -2,19 +2,26 @@
{
"base": {
"c": 3,
},
"conflicts": [],
- "ctx": ObjectContaining {
- "_strategyCache": Any<Map>,
+ "ctx": {
+ "_strategyCache": Map {},
"config": {
"customStrategies": {},
"debug": false,
},
"strategies": {},
},
"filePath": "test.json",
+ "logger": {
+ "debug": [Function spy],
+ "error": [Function spy],
+ "flush": [Function spy],
+ "info": [Function spy],
+ "warn": [Function spy],
+ },
"ours": {
"a": 1,
},
"path": "",
"theirs": {
Number of calls: 1
❯ src/merge-processor.test.ts:70:29
|
src/index.test.ts > resolveConflicts > processes files without conflicts successfully:
lib/src/index.test.ts#L76
AssertionError: expected "mergeObject" to be called with arguments: [ { ours: { a: 2 }, …(6) } ]
Received:
1st mergeObject call:
@@ -1,15 +1,25 @@
[
{
"base": undefined,
"conflicts": [],
- "ctx": ObjectContaining {
- "_strategyCache": Any<Map>,
- "config": Any<Object>,
+ "ctx": {
+ "_strategyCache": Map {},
+ "config": {
+ "customStrategies": {},
+ "debug": false,
+ },
"strategies": {},
},
"filePath": "test.json",
+ "logger": {
+ "debug": [Function spy],
+ "error": [Function spy],
+ "flush": [Function spy],
+ "info": [Function spy],
+ "warn": [Function spy],
+ },
"ours": {
"a": 2,
},
"path": "",
"theirs": {
Number of calls: 1
❯ src/index.test.ts:76:29
|