F1: conflict toast closes when the merge ends, toasts keep off the commit box

The merge store dismisses its conflict warning once the status lists no
conflicted file (resolved, committed or aborted) and replaces it on a new
conflicted merge. The toast stack moves above areas registered with
keepClearOf; the Changes window registers its commit box.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
danny 2026-11-02 18:53:08 +01:00
parent e228d11ef9
commit 750ecf5e51
7 changed files with 235 additions and 9 deletions

View file

@ -383,6 +383,15 @@ describe("the Changes store", () => {
});
describe("the Changes window", () => {
it("keeps toasts off the commit box while it is mounted", async () => {
const wrapper = await mountChanges();
const notifications = useNotificationsStore(pinia);
expect(notifications.keepClear).toEqual([wrapper.get("[data-test=changes-commit]").element]);
mounted = mounted.filter((m) => m !== wrapper);
wrapper.unmount();
expect(notifications.keepClear).toEqual([]);
});
it("shows the branch, the counts and the three groups", async () => {
const wrapper = await mountChanges();
expect(wrapper.get("[data-test=changes-status]").text()).toBe("main: 3 staged, 2 changed, 1 untracked");