Skip to content

Commit a8bf07e

Browse files
QuorafindQuorafind
committed
chore: resolve conflict
1 parent c976a64 commit a8bf07e

10 files changed

+89
-10997
lines changed

‎src/__tests__/CanvasTaskOperationUtils.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ describe("CanvasTaskOperationUtils", () => {
3030

3131
beforeEach(() => {
3232
utils = new CanvasTaskOperationUtils(mockApp as any);
33-
3433
// Reset mocks
3534
jest.clearAllMocks();
3635
});

‎src/__tests__/DeleteActionExecutor.canvas.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
6868

6969
mockContext = {
7070
task: canvasTask,
71-
plugin: mockPlugin,
71+
plugin: mockPlugin as any,
7272
app: mockApp,
7373
};
7474

@@ -105,7 +105,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
105105

106106
mockContext = {
107107
task: canvasTask,
108-
plugin: mockPlugin,
108+
plugin: mockPlugin as any,
109109
app: mockApp,
110110
};
111111

@@ -140,7 +140,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
140140

141141
mockContext = {
142142
task: canvasTask,
143-
plugin: mockPlugin,
143+
plugin: mockPlugin as any,
144144
app: mockApp,
145145
};
146146

@@ -191,7 +191,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
191191
// Test Canvas task routing
192192
mockContext = {
193193
task: canvasTask,
194-
plugin: mockPlugin,
194+
plugin: mockPlugin as any,
195195
app: mockApp,
196196
};
197197

@@ -208,7 +208,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
208208
// Test Markdown task routing (should not call Canvas updater)
209209
mockContext = {
210210
task: markdownTask,
211-
plugin: mockPlugin,
211+
plugin: mockPlugin as any,
212212
app: mockApp,
213213
};
214214

@@ -250,7 +250,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
250250

251251
mockContext = {
252252
task: canvasTask,
253-
plugin: mockPlugin,
253+
plugin: mockPlugin as any,
254254
app: mockApp,
255255
};
256256

@@ -283,7 +283,7 @@ describe("DeleteActionExecutor - Canvas Tasks", () => {
283283

284284
mockContext = {
285285
task: canvasTask,
286-
plugin: mockPlugin,
286+
plugin: mockPlugin as any,
287287
app: mockApp,
288288
};
289289

‎src/__tests__/DeleteActionExecutor.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ describe("DeleteActionExecutor", () => {
4444
content: "Test task to delete",
4545
completed: true,
4646
status: "x",
47-
originalMarkdown: "- [x] Test task to delete",
4847
metadata: {
4948
tags: [],
5049
children: [],
5150
onCompletion: "delete",
5251
},
52+
originalMarkdown: "- [x] Test task to delete 🏁 delete",
5353
line: 5,
5454
filePath: "test.md",
5555
};

‎src/__tests__/DuplicateActionExecutor.canvas.test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
6969

7070
mockContext = {
7171
task: canvasTask,
72-
plugin: mockPlugin,
73-
app: mockApp,
72+
plugin: mockPlugin as any,
73+
app: mockApp as any,
7474
};
7575

7676
// Mock successful duplication
@@ -119,8 +119,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
119119

120120
mockContext = {
121121
task: canvasTask,
122-
plugin: mockPlugin,
123-
app: mockApp,
122+
plugin: mockPlugin as any,
123+
app: mockApp as any,
124124
};
125125

126126
// Mock successful duplication
@@ -170,8 +170,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
170170

171171
mockContext = {
172172
task: canvasTask,
173-
plugin: mockPlugin,
174-
app: mockApp,
173+
plugin: mockPlugin as any,
174+
app: mockApp as any,
175175
};
176176

177177
// Mock duplication failure
@@ -215,8 +215,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
215215

216216
mockContext = {
217217
task: canvasTask,
218-
plugin: mockPlugin,
219-
app: mockApp,
218+
plugin: mockPlugin as any,
219+
app: mockApp as any,
220220
};
221221

222222
// Mock target file exists
@@ -271,8 +271,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
271271

272272
mockContext = {
273273
task: canvasTask,
274-
plugin: mockPlugin,
275-
app: mockApp,
274+
plugin: mockPlugin as any,
275+
app: mockApp as any,
276276
};
277277

278278
// Mock target file exists
@@ -318,8 +318,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
318318

319319
mockContext = {
320320
task: canvasTask,
321-
plugin: mockPlugin,
322-
app: mockApp,
321+
plugin: mockPlugin as any,
322+
app: mockApp as any,
323323
};
324324

325325
// Mock target file does not exist, then gets created
@@ -363,8 +363,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
363363

364364
mockContext = {
365365
task: canvasTask,
366-
plugin: mockPlugin,
367-
app: mockApp,
366+
plugin: mockPlugin as any,
367+
app: mockApp as any,
368368
};
369369

370370
// Mock target file does not exist and creation fails
@@ -413,8 +413,8 @@ describe("DuplicateActionExecutor - Canvas Tasks", () => {
413413

414414
mockContext = {
415415
task: canvasTask,
416-
plugin: mockPlugin,
417-
app: mockApp,
416+
plugin: mockPlugin as any,
417+
app: mockApp as any,
418418
};
419419

420420
const result = await executor.execute(mockContext, invalidConfig);

‎src/__tests__/MoveActionExecutor.canvas.test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
9696

9797
mockContext = {
9898
task: canvasTask,
99-
plugin: mockPlugin,
100-
app: mockApp,
99+
plugin: mockPlugin as any,
100+
app: mockApp as any,
101101
};
102102

103103
// Mock successful move
@@ -144,8 +144,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
144144

145145
mockContext = {
146146
task: canvasTask,
147-
plugin: mockPlugin,
148-
app: mockApp,
147+
plugin: mockPlugin as any,
148+
app: mockApp as any,
149149
};
150150

151151
// Mock move failure
@@ -187,8 +187,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
187187

188188
mockContext = {
189189
task: canvasTask,
190-
plugin: mockPlugin,
191-
app: mockApp,
190+
plugin: mockPlugin as any,
191+
app: mockApp as any,
192192
};
193193

194194
// Mock successful Canvas deletion
@@ -242,8 +242,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
242242

243243
mockContext = {
244244
task: canvasTask,
245-
plugin: mockPlugin,
246-
app: mockApp,
245+
plugin: mockPlugin as any,
246+
app: mockApp as any,
247247
};
248248

249249
// Mock successful Canvas deletion
@@ -292,8 +292,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
292292

293293
mockContext = {
294294
task: canvasTask,
295-
plugin: mockPlugin,
296-
app: mockApp,
295+
plugin: mockPlugin as any,
296+
app: mockApp as any,
297297
};
298298

299299
// Mock target file does not exist and creation fails
@@ -337,8 +337,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
337337

338338
mockContext = {
339339
task: canvasTask,
340-
plugin: mockPlugin,
341-
app: mockApp,
340+
plugin: mockPlugin as any,
341+
app: mockApp as any,
342342
};
343343

344344
// Mock successful target file operations but Canvas deletion failure
@@ -387,8 +387,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
387387

388388
mockContext = {
389389
task: canvasTask,
390-
plugin: mockPlugin,
391-
app: mockApp,
390+
plugin: mockPlugin as any,
391+
app: mockApp as any,
392392
};
393393

394394
// Mock target file does not exist and creation fails
@@ -440,8 +440,8 @@ describe("MoveActionExecutor - Canvas Tasks", () => {
440440

441441
mockContext = {
442442
task: canvasTask,
443-
plugin: mockPlugin,
444-
app: mockApp,
443+
plugin: mockPlugin as any,
444+
app: mockApp as any,
445445
};
446446

447447
const result = await executor.execute(mockContext, invalidConfig);

0 commit comments

Comments
 (0)