Skip to content

Commit 83c29a2

Browse files
committed
Fix unit tests
1 parent 8d7dff2 commit 83c29a2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"merge-driver",
6666
"conflict",
6767
"Progressive",
68-
"Modern",
6968
"Seamless integration",
69+
"Modern",
7070
"Developer Experience",
7171
"DX",
7272
"mayank1513"

lib/src/index.test.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
import { describe, it, expect, beforeEach } from "vitest";
1+
import { describe, it, expect, beforeEach, vi } from "vitest";
22
import plugin, { semverMax, semverMin, semverOurs, semverTheirs } from "./index";
33
import {
44
StrategyStatus_OK,
55
StrategyStatus_CONTINUE,
66
StrategyStatus_FAIL,
77
} from "git-json-resolver/utils";
88

9-
const run = (fn: any, ours: any, theirs: any) => fn({ ours, theirs, base: undefined, path: [] });
9+
// Mock logger
10+
const mockLogger = {
11+
debug: vi.fn(),
12+
info: vi.fn(),
13+
warn: vi.fn(),
14+
error: vi.fn(),
15+
flush: vi.fn(),
16+
};
17+
18+
const run = (fn: any, ours: any, theirs: any) =>
19+
fn({ ours, theirs, base: undefined, path: [], logger: mockLogger });
1020

1121
const reset = (overrides: any = {}) => {
1222
plugin.init?.({

0 commit comments

Comments
 (0)