Files
ClaudeDo/tests/ClaudeDo.Ui.Tests/ViewModels/WorktreesOverviewReconcileTickTests.cs
T
mika kuns cad0582b37 fix(merge): conventional merge-commit default and live verify progress
The merge commit message was hand-rolled per caller ("Merge task: <title>",
"Merge <branch>", "Merge subtask") and ignored the task's commit type. Every
caller now passes a blank message and TaskMergeService fills in
CommitMessageBuilder.BuildMerge -> {commitType}(list-slug): merge <title> plus the
ClaudeDo-Task trailer; the merge modal prefills it from GetMergeTargets.

A merge whose list has a verify command holds the MergeTask call for minutes (5m46s
on this repo), during which the modal only disabled its button - no spinner, no
message, so a landed merge looked like a dead app. TaskMergeService now broadcasts
MergeProgress(taskId, phase, elapsedSeconds) for the merging and verifying phases
(re-reported every 30s) plus a WorkerLog line when verify starts; the modal shows a
spinner and the localized phase.
2026-08-11 19:14:36 +02:00

121 lines
4.6 KiB
C#

using ClaudeDo.Data.Models;
using ClaudeDo.Ui.Services;
using ClaudeDo.Ui.ViewModels.Modals;
using Xunit;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
namespace ClaudeDo.Ui.Tests.ViewModels;
// The overview's 4s reconcile tick goes through LoadAsync, which rebuilds every row instance and
// resets SelectedCount/ConflictRows/BatchProgress. Left bare, that wipes the user's batch-merge
// ticks and the highlighted row every four seconds — assembling a multi-worktree selection would
// be impossible. The tick has to carry that state across the reload.
public class WorktreesOverviewReconcileTickTests
{
private sealed class FakeWorker : StubWorkerClient
{
public List<WorktreeOverviewDto> Worktrees { get; set; } = new();
public override Task<List<WorktreeOverviewDto>> GetWorktreesOverviewAsync(string? listId)
=> Task.FromResult(Worktrees.ToList());
public override Task<MergeTargetsDto?> GetMergeTargetsAsync(string taskId)
=> Task.FromResult<MergeTargetsDto?>(new MergeTargetsDto("main", new[] { "main" }, "chore(list): merge t"));
}
private sealed class NoopMergeCoordinator : IMergeCoordinator
{
public Task ResolveConflictAsync(string taskId, string targetBranch) => Task.CompletedTask;
}
private static WorktreeOverviewDto Wt(string taskId, WorktreeState state = WorktreeState.Active) =>
new(taskId, $"Task {taskId}", TaskStatus.WaitingForReview, "L1", "Work",
$@"C:\wt\{taskId}", $"claudedo/{taskId}", "base0", state, "+1 -0",
DateTime.UtcNow, PathExistsOnDisk: true);
private static async Task<(WorktreesOverviewModalViewModel Vm, FakeWorker Worker)> BuildLoadedAsync()
{
var worker = new FakeWorker { Worktrees = { Wt("a"), Wt("b"), Wt("c") } };
var vm = new WorktreesOverviewModalViewModel(
worker, () => throw new InvalidOperationException("no diff vm in this test"), new NoopMergeCoordinator());
vm.Configure("L1", "Work");
await vm.LoadAsync();
return (vm, worker);
}
[Fact]
public async Task Tick_keeps_the_batch_merge_ticks()
{
var (vm, _) = await BuildLoadedAsync();
vm.Rows.Single(r => r.TaskId == "a").IsChecked = true;
vm.Rows.Single(r => r.TaskId == "c").IsChecked = true;
Assert.Equal(2, vm.SelectedCount);
await vm.ReconcileTickAsync();
Assert.True(vm.Rows.Single(r => r.TaskId == "a").IsChecked);
Assert.False(vm.Rows.Single(r => r.TaskId == "b").IsChecked);
Assert.True(vm.Rows.Single(r => r.TaskId == "c").IsChecked);
Assert.Equal(2, vm.SelectedCount);
}
[Fact]
public async Task Tick_re_points_the_selected_row_at_the_fresh_instance()
{
var (vm, _) = await BuildLoadedAsync();
vm.SelectRow(vm.Rows.Single(r => r.TaskId == "b"));
await vm.ReconcileTickAsync();
Assert.NotNull(vm.SelectedRow);
Assert.Equal("b", vm.SelectedRow!.TaskId);
// Not the stale pre-reload instance: it must be the row actually in the collection.
Assert.Contains(vm.Rows, r => ReferenceEquals(r, vm.SelectedRow));
Assert.True(vm.SelectedRow.IsSelected);
}
[Fact]
public async Task Tick_clears_the_selection_when_that_worktree_is_gone()
{
var (vm, worker) = await BuildLoadedAsync();
vm.SelectRow(vm.Rows.Single(r => r.TaskId == "b"));
worker.Worktrees.RemoveAll(w => w.TaskId == "b");
await vm.ReconcileTickAsync();
Assert.Null(vm.SelectedRow);
}
[Fact]
public async Task Tick_keeps_a_finished_batch_outcome_and_its_conflict_row()
{
var (vm, _) = await BuildLoadedAsync();
vm.Rows.Single(r => r.TaskId == "a").MergeOutcome = BatchMergeOutcome.Merged;
vm.Rows.Single(r => r.TaskId == "b").MergeOutcome = BatchMergeOutcome.Conflict;
await vm.ReconcileTickAsync();
Assert.Equal(BatchMergeOutcome.Merged, vm.Rows.Single(r => r.TaskId == "a").MergeOutcome);
Assert.Equal(BatchMergeOutcome.Conflict, vm.Rows.Single(r => r.TaskId == "b").MergeOutcome);
Assert.Single(vm.ConflictRows);
Assert.Equal("b", vm.ConflictRows[0].TaskId);
}
[Fact]
public async Task Tick_leaves_a_newly_appeared_worktree_unticked()
{
var (vm, worker) = await BuildLoadedAsync();
vm.Rows.Single(r => r.TaskId == "a").IsChecked = true;
worker.Worktrees.Add(Wt("d"));
await vm.ReconcileTickAsync();
Assert.True(vm.Rows.Single(r => r.TaskId == "a").IsChecked);
Assert.False(vm.Rows.Single(r => r.TaskId == "d").IsChecked);
Assert.Equal(1, vm.SelectedCount);
}
}