releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 39 Wiki Activity

fix(worker): carry ExpectsNoDiff into the relocated merge MCP tools

Browse Source 
Conflict resolution for the #266 merge: #247 had moved PreviewMerge/PreviewMergeSet
and MergePreviewSetEntryDto out of ExternalMcpService into MergeMcpTools, so #266's
in-place edits to those had to be re-applied at the new location, together with the
PreviewMergeSet_ReportsExpectsNoDiffPerTask test.
This commit is contained in:
Mika Kuns
2026-09-02 13:59:22 +02:00
parent 7e847638cf
commit 4ee1d05f06
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ClaudeDo.Worker.Tests/External/MergeMcpToolsTests.cs
Vendored
+16
View File
@@ -1139,6 +1139,22 @@ public sealed class MergeMcpToolsTests : IDisposable
Assert.Empty(result.Overlaps);
}
[Fact]
public async Task PreviewMergeSet_ReportsExpectsNoDiffPerTask()
{
if (!GitAvailable) { Assert.True(true, "git not available -- skipping"); return; }
var (task, list, _) = await SeedWorktreeAsync(TaskStatus.WaitingForReview);
task.ExpectsNoDiff = true;
await _tasks.UpdateAsync(task, CancellationToken.None);
var target = await new GitService().GetCurrentBranchAsync(list.WorkingDir!, CancellationToken.None);
var sut = BuildSut(CreateQueue());
var result = await sut.PreviewMergeSet([task.Id], target, cancellationToken: CancellationToken.None);
Assert.True(Assert.Single(result.Tasks).ExpectsNoDiff);
}
[Fact]
public async Task PreviewMergeSet_ReportsProgressPerTask()
{