mirror of
https://github.com/l0ng-ai/openidea.git
synced 2026-11-14 16:07:52 +00:00
l0ng-ai
27ee6fde61
Update could fail when incoming files collided with local untracked files and show nothing, because VCS popups were disabled. The shared Git command runners now mark progress and results as responses to a user command, so Update, Pull, Fetch, Push and local Git operations stay visible; background notifications and explicitly handled or cancelled failures stay quiet.
74 lines
2.8 KiB
TypeScript
74 lines
2.8 KiB
TypeScript
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
|
|
|
test("shows Update failures from the branch menu even when VCS notifications are muted", async ({
|
|
workbench: page,
|
|
}) => {
|
|
await stubDesktop(page);
|
|
await page.evaluate(async () => {
|
|
const root = "/dev/acme-api";
|
|
const branch = { head: "main", upstream: "origin/main", behind: 68, ahead: 0, operation: null, headCommit: "c1" };
|
|
const branches = [
|
|
{
|
|
name: "main",
|
|
current: true,
|
|
remote: false,
|
|
upstream: "origin/main",
|
|
behind: 68,
|
|
ahead: 0,
|
|
commit: "c1",
|
|
lastCommitMs: 0,
|
|
},
|
|
];
|
|
const h = window.__ipc.handlers;
|
|
h.vcs_branch_info = () => branch;
|
|
h.vcs_branches = () => branches;
|
|
h.vcs_roots = () => [{ root, head: "main", headCommit: "c1", operation: null }];
|
|
h.vcs_status = () => [];
|
|
h.vcs_log = () => [];
|
|
h.vcs_tags = () => [];
|
|
h.vcs_config_get = () => null;
|
|
h.vcs_merge_base = () => "c1";
|
|
h.vcs_remote = () => {
|
|
throw {
|
|
kind: "invalid",
|
|
message:
|
|
"The following untracked working tree files would be overwritten by merge: e2e/settingsFormLayout.spec.ts",
|
|
};
|
|
};
|
|
const projectModule = "/src/platform/project.ts";
|
|
const { useProject } = await import(/* @vite-ignore */ projectModule);
|
|
useProject.setState({
|
|
settings: {
|
|
...useProject.getState().settings,
|
|
notifications: { groups: { vcs: { display: "none", log: true } } },
|
|
},
|
|
});
|
|
const storeModule = "/src/features/vcs/store.ts";
|
|
const { useVcs } = await import(/* @vite-ignore */ storeModule);
|
|
useVcs.setState({
|
|
available: true,
|
|
root,
|
|
repo: root,
|
|
roots: [root],
|
|
branch,
|
|
branches,
|
|
branchesLoaded: true,
|
|
});
|
|
const contextModule = "/src/platform/context.ts";
|
|
const { setContext } = await import(/* @vite-ignore */ contextModule);
|
|
setContext("vcsAvailable", true);
|
|
const actionsModule = "/src/platform/actions.ts";
|
|
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
|
await executeAction("vcs.showLog");
|
|
});
|
|
const branches = page.getByRole("tree", { name: "Branches" });
|
|
await branches.getByRole("treeitem", { name: /main current/ }).click({ button: "right" });
|
|
await page.getByRole("menuitem", { name: "Update", exact: true }).click();
|
|
const dialog = page.getByRole("dialog", { name: "Update Project", exact: true });
|
|
await expect(dialog).toBeVisible();
|
|
await dialog.getByRole("button", { name: "OK", exact: true }).click();
|
|
await expect(page.getByText("Update failed", { exact: true })).toBeVisible();
|
|
await expect(page.getByText(/untracked working tree files would be overwritten by merge/)).toBeVisible();
|
|
expect(await ipcCalls(page, "vcs_remote")).toHaveLength(1);
|
|
});
|