jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct checkout-diff-manager test file contents

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Mohamed Boudra
2026-04-01 04:49:03 +00:00
co-authored by Claude Opus 4.6
parent 4b12ebd5c0
commit 8d55764313
1 changed files with 132 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/server/checkout-diff-manager.test.ts
+130 -149
View File
@@ -1,153 +1,134 @@
commit 07b077f1a28e7126f9d2b48be03bca8486173aac import path from "node:path";
Author: Mohamed Boudra <boudra.moha@gmail.com> import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
Date: Wed Apr 1 04:38:45 2026 +0000
fix: Linux checkout diff watchers and rewind command ordering const { execMock, getCheckoutDiffMock, resolveCheckoutGitDirMock, readdirMock, watchCalls } =
vi.hoisted(() => {
const hoistedWatchCalls: Array<{ path: string; close: ReturnType<typeof vi.fn> }> = [];
return {
execMock: vi.fn((_command: string, _options: unknown, callback: (error: null, result: { stdout: string; stderr: string }) => void) => {
callback(null, { stdout: "/tmp/repo\n", stderr: "" });
}),
getCheckoutDiffMock: vi.fn(async () => ({ diff: "", structured: [] })),
resolveCheckoutGitDirMock: vi.fn(async () => "/tmp/repo/.git"),
readdirMock: vi.fn(async (directory: string) => {
if (directory === "/tmp/repo") {
return [
{ name: "packages", isDirectory: () => true },
{ name: ".git", isDirectory: () => true },
{ name: "README.md", isDirectory: () => false },
];
}
if (directory === path.join("/tmp/repo", "packages")) {
return [
{ name: "server", isDirectory: () => true },
{ name: "app", isDirectory: () => true },
];
}
if (directory === path.join("/tmp/repo", "packages", "server")) {
return [{ name: "src", isDirectory: () => true }];
}
if (directory === path.join("/tmp/repo", "packages", "server", "src")) {
return [{ name: "server", isDirectory: () => true }];
}
return [];
}),
watchCalls: hoistedWatchCalls,
};
});
Use non-recursive directory watchers on Linux since recursive fs.watch vi.mock("child_process", () => ({
is not supported. Dynamically discover and watch subdirectories, refreshing exec: execMock,
the watcher tree on changes. Also pin rewind command first in the slash }));
command list and remove stale .gitignore entry.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> vi.mock("node:fs/promises", async () => {
const actual = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
return {
...actual,
readdir: readdirMock,
};
});
diff --git a/packages/server/src/server/checkout-diff-manager.test.ts b/packages/server/src/server/checkout-diff-manager.test.ts vi.mock("node:fs", async () => {
new file mode 100644 const actual = await vi.importActual<typeof import("node:fs")>("node:fs");
index 00000000..22f0fda8 return {
--- /dev/null ...actual,
+++ b/packages/server/src/server/checkout-diff-manager.test.ts watch: vi.fn((watchPath: string) => {
@@ -0,0 +1,134 @@ const close = vi.fn();
+import path from "node:path"; watchCalls.push({ path: watchPath, close });
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; return {
+ close,
+const { execMock, getCheckoutDiffMock, resolveCheckoutGitDirMock, readdirMock, watchCalls } = on: vi.fn().mockReturnThis(),
+ vi.hoisted(() => { } as any;
+ const hoistedWatchCalls: Array<{ path: string; close: ReturnType<typeof vi.fn> }> = []; }),
+ return { };
+ execMock: vi.fn((_command: string, _options: unknown, callback: (error: null, result: { stdout: string; stderr: string }) => void) => { });
+ callback(null, { stdout: "/tmp/repo\n", stderr: "" });
+ }), vi.mock("../utils/checkout-git.js", () => ({
+ getCheckoutDiffMock: vi.fn(async () => ({ diff: "", structured: [] })), getCheckoutDiff: getCheckoutDiffMock,
+ resolveCheckoutGitDirMock: vi.fn(async () => "/tmp/repo/.git"), }));
+ readdirMock: vi.fn(async (directory: string) => {
+ if (directory === "/tmp/repo") { vi.mock("./checkout-git-utils.js", () => ({
+ return [ READ_ONLY_GIT_ENV: {},
+ { name: "packages", isDirectory: () => true }, resolveCheckoutGitDir: resolveCheckoutGitDirMock,
+ { name: ".git", isDirectory: () => true }, toCheckoutError: vi.fn((error: unknown) => ({
+ { name: "README.md", isDirectory: () => false }, message: error instanceof Error ? error.message : String(error),
+ ]; })),
+ } }));
+ if (directory === path.join("/tmp/repo", "packages")) {
+ return [ import { CheckoutDiffManager } from "./checkout-diff-manager.js";
+ { name: "server", isDirectory: () => true },
+ { name: "app", isDirectory: () => true }, describe("CheckoutDiffManager Linux watchers", () => {
+ ]; const originalPlatform = process.platform;
+ }
+ if (directory === path.join("/tmp/repo", "packages", "server")) { beforeEach(() => {
+ return [{ name: "src", isDirectory: () => true }]; watchCalls.length = 0;
+ } execMock.mockClear();
+ if (directory === path.join("/tmp/repo", "packages", "server", "src")) { getCheckoutDiffMock.mockClear();
+ return [{ name: "server", isDirectory: () => true }]; resolveCheckoutGitDirMock.mockClear();
+ } readdirMock.mockClear();
+ return []; Object.defineProperty(process, "platform", {
+ }), configurable: true,
+ watchCalls: hoistedWatchCalls, value: "linux",
+ }; });
+ }); });
+
+vi.mock("child_process", () => ({ afterEach(() => {
+ exec: execMock, Object.defineProperty(process, "platform", {
+})); configurable: true,
+ value: originalPlatform,
+vi.mock("node:fs/promises", async () => { });
+ const actual = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises"); });
+ return {
+ ...actual, test("watches nested repository directories on Linux", async () => {
+ readdir: readdirMock, const logger = {
+ }; child: () => logger,
+}); warn: vi.fn(),
+ };
+vi.mock("node:fs", async () => { const manager = new CheckoutDiffManager({
+ const actual = await vi.importActual<typeof import("node:fs")>("node:fs"); logger: logger as any,
+ return { paseoHome: "/tmp/paseo-test",
+ ...actual, });
+ watch: vi.fn((watchPath: string) => {
+ const close = vi.fn(); const subscription = await manager.subscribe(
+ watchCalls.push({ path: watchPath, close }); {
+ return { cwd: path.join("/tmp/repo", "packages", "server"),
+ close, compare: { mode: "uncommitted" },
+ on: vi.fn().mockReturnThis(), },
+ } as any; () => {},
+ }), );
+ };
+}); expect(subscription.initial.error).toBeNull();
+ expect(watchCalls.map((entry) => entry.path).sort()).toEqual([
+vi.mock("../utils/checkout-git.js", () => ({ "/tmp/repo",
+ getCheckoutDiff: getCheckoutDiffMock, "/tmp/repo/.git",
+})); "/tmp/repo/packages",
+ "/tmp/repo/packages/app",
+vi.mock("./checkout-git-utils.js", () => ({ "/tmp/repo/packages/server",
+ READ_ONLY_GIT_ENV: {}, "/tmp/repo/packages/server/src",
+ resolveCheckoutGitDir: resolveCheckoutGitDirMock, "/tmp/repo/packages/server/src/server",
+ toCheckoutError: vi.fn((error: unknown) => ({ ]);
+ message: error instanceof Error ? error.message : String(error),
+ })), subscription.unsubscribe();
+})); manager.dispose();
+ });
+import { CheckoutDiffManager } from "./checkout-diff-manager.js"; });
+
+describe("CheckoutDiffManager Linux watchers", () => {
+ const originalPlatform = process.platform;
+
+ beforeEach(() => {
+ watchCalls.length = 0;
+ execMock.mockClear();
+ getCheckoutDiffMock.mockClear();
+ resolveCheckoutGitDirMock.mockClear();
+ readdirMock.mockClear();
+ Object.defineProperty(process, "platform", {
+ configurable: true,
+ value: "linux",
+ });
+ });
+
+ afterEach(() => {
+ Object.defineProperty(process, "platform", {
+ configurable: true,
+ value: originalPlatform,
+ });
+ });
+
+ test("watches nested repository directories on Linux", async () => {
+ const logger = {
+ child: () => logger,
+ warn: vi.fn(),
+ };
+ const manager = new CheckoutDiffManager({
+ logger: logger as any,
+ paseoHome: "/tmp/paseo-test",
+ });
+
+ const subscription = await manager.subscribe(
+ {
+ cwd: path.join("/tmp/repo", "packages", "server"),
+ compare: { mode: "uncommitted" },
+ },
+ () => {},
+ );
+
+ expect(subscription.initial.error).toBeNull();
+ expect(watchCalls.map((entry) => entry.path).sort()).toEqual([
+ "/tmp/repo",
+ "/tmp/repo/.git",
+ "/tmp/repo/packages",
+ "/tmp/repo/packages/app",
+ "/tmp/repo/packages/server",
+ "/tmp/repo/packages/server/src",
+ "/tmp/repo/packages/server/src/server",
+ ]);
+
+ subscription.unsubscribe();
+ manager.dispose();
+ });
+});