Files
ClaudeDo/tests/ClaudeDo.Ui.Tests/ViewModels/DetailsIslandPlanningTests.cs
T
mika kuns 251b70ce83
Changelog / changelog (push) Successful in 2s
Release / release (push) Successful in 43s
feat(merge): Stash-Option fuer uncommittete Aenderungen im Ziel-Tree
Ein dirty Ziel-Arbeitsverzeichnis gibt jetzt den eigenen Status
dirty_target zurueck statt blocked. Die UI bietet daraufhin einen
Retry an, der per git merge --autostash stasht, merged und die
Aenderungen danach wiederherstellt - opt-in pro Merge:

- Approve & Merge: Bestaetigungsdialog
- Merge-Modal: Button "Aenderungen stashen und mergen"
- MCP (merge_task/review_task) wirft weiterhin, kein autostash dort
2026-09-11 11:43:28 +02:00

134 lines
5.0 KiB
C#

using System.Collections.ObjectModel;
using ClaudeDo.Data;
using ClaudeDo.Data.Models;
using ClaudeDo.Ui.Services;
using ClaudeDo.Ui.ViewModels.Islands;
using Microsoft.EntityFrameworkCore;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
namespace ClaudeDo.Ui.Tests.ViewModels;
public class DetailsIslandPlanningTests : IDisposable
{
private readonly string _dbPath;
public DetailsIslandPlanningTests()
{
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_details_test_{Guid.NewGuid():N}.db");
using var ctx = NewContext();
ctx.Database.EnsureCreated();
}
public void Dispose()
{
try { File.Delete(_dbPath); } catch { }
try { File.Delete(_dbPath + "-wal"); } catch { }
try { File.Delete(_dbPath + "-shm"); } catch { }
}
private ClaudeDoDbContext NewContext()
{
var opts = new DbContextOptionsBuilder<ClaudeDoDbContext>()
.UseSqlite($"Data Source={_dbPath}")
.Options;
return new ClaudeDoDbContext(opts);
}
private sealed class FakeWorkerClient : StubWorkerClient
{
public MergeTargetsDto? MergeTargetsResult { get; set; }
public override Task<MergeTargetsDto?> GetMergeTargetsAsync(string taskId) => Task.FromResult(MergeTargetsResult);
}
private DetailsIslandViewModel BuildVm(StubWorkerClient worker)
{
var factory = new TestDbFactory(NewContext);
return new DetailsIslandViewModel(factory, worker, new NullServiceProvider(), new ClaudeDo.Ui.Services.MergeCoordinator());
}
// Connected worker whose review calls fail the way the hub does when the task
// is no longer WaitingForReview (e.g. after "Merge all" folded the parent).
private sealed class ThrowingReviewWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public override Task<MergeResultDto?> ApproveReviewAsync(string taskId, string targetBranch, bool autostash = false) =>
Task.FromException<MergeResultDto?>(new InvalidOperationException("Task is not waiting for review; cannot approve."));
}
// ── Review-action resilience: a failing hub call must not crash the app ───
[Fact]
public async Task ApproveReview_WhenWorkerThrows_DoesNotPropagate()
{
var vm = BuildVm(new ThrowingReviewWorkerClient());
vm.Bind(new TaskRowViewModel { Id = "p", Status = TaskStatus.WaitingForReview });
// Before the fix this surfaced the HubException as an unobserved
// async-void exception from the command, crashing the process.
var ex = await Record.ExceptionAsync(() => vm.ApproveReviewCommand.ExecuteAsync(null));
Assert.Null(ex);
}
// ── Branch-load test exercising the VM via Bind ──────────────────────────
[Fact]
public async Task MergeTargetBranches_LoadedFromWorkerOnPlanningParent()
{
// Seed a Planning parent with one child that has a worktree
const string parentId = "parent-1";
const string childId = "child-1";
const string listId = "list-1";
await using (var ctx = NewContext())
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity
{
Number = TestTaskNumbers.Next(),
Id = parentId, ListId = listId, Title = "Parent",
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active,
CreatedAt = DateTime.UtcNow,
});
ctx.Tasks.Add(new TaskEntity
{
Number = TestTaskNumbers.Next(),
Id = childId, ListId = listId, Title = "Child",
Status = TaskStatus.Done, ParentTaskId = parentId, CreatedAt = DateTime.UtcNow,
});
ctx.Set<WorktreeEntity>().Add(new WorktreeEntity
{
TaskId = childId, Path = "/tmp/wt", BranchName = "branch",
BaseCommit = "abc", CreatedAt = DateTime.UtcNow,
});
await ctx.SaveChangesAsync();
}
var fake = new FakeWorkerClient
{
MergeTargetsResult = new MergeTargetsDto("main", new[] { "main", "dev" }, "chore(list): merge t"),
};
var vm = BuildVm(fake);
// Bind triggers BindAsync → LoadPlanningChildrenAsync → GetMergeTargetsAsync
var parentRow = new TaskRowViewModel { Id = parentId };
parentRow.Status = TaskStatus.Idle;
parentRow.PlanningPhase = PlanningPhase.Active;
vm.Bind(parentRow);
// Wait for the background load to settle
var deadline = DateTime.UtcNow.AddSeconds(5);
while (DateTime.UtcNow < deadline && vm.Merge.MergeTargetBranches.Count == 0)
await Task.Delay(20);
Assert.Contains("main", vm.Merge.MergeTargetBranches);
Assert.Contains("dev", vm.Merge.MergeTargetBranches);
Assert.Equal("main", vm.Merge.SelectedMergeTarget);
}
}