can1357
b2c94bef1a
- Created new @oh-my-pi/pi-utils workspace package with shared utilities for logging, process management, stream handling, and temporary directory management. - Migrated all packages to use centralized logger from @oh-my-pi/pi-utils instead of local winston implementations. - Replaced custom process spawning and stream reading implementations with standardized cspawn and readLines utilities across all modules. - Converted synchronous file operations and process spawning to async patterns using Bun shell syntax and fs/promises. - Added streaming edit abort functionality with configurable setting to abort on patch preview failures. - Updated test framework from vitest to bun:test across all test suites.
72 lines
2.6 KiB
TypeScript
72 lines
2.6 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, test } from "bun:test";
|
|
import { rm } from "node:fs/promises";
|
|
import * as path from "node:path";
|
|
import { type AsyncTempDir, createTempDir } from "@oh-my-pi/pi-utils";
|
|
import { collapse } from "../../src/lib/worktree/collapse";
|
|
import { WORKTREE_BASE } from "../../src/lib/worktree/constants";
|
|
import { getRepoRoot, git } from "../../src/lib/worktree/git";
|
|
import { create } from "../../src/lib/worktree/operations";
|
|
|
|
let repoPath: AsyncTempDir;
|
|
let originalCwd: string;
|
|
|
|
async function createTestRepo(): Promise<AsyncTempDir> {
|
|
const tempDir = await createTempDir("@wt-test-");
|
|
await git(["init", "-b", "main"], tempDir.path);
|
|
await git(["config", "user.email", "test@example.com"], tempDir.path);
|
|
await git(["config", "user.name", "Test User"], tempDir.path);
|
|
await Bun.write(path.join(tempDir.path, "README.md"), "init");
|
|
await git(["add", "README.md"], tempDir.path);
|
|
await git(["commit", "-m", "init"], tempDir.path);
|
|
return tempDir;
|
|
}
|
|
|
|
async function cleanupRepo(repoRoot: AsyncTempDir): Promise<void> {
|
|
const repoName = path.basename(repoRoot.path);
|
|
await rm(path.join(WORKTREE_BASE, repoName), { recursive: true, force: true });
|
|
await repoRoot.remove();
|
|
}
|
|
|
|
describe("collapse strategies", () => {
|
|
beforeEach(async () => {
|
|
originalCwd = process.cwd();
|
|
repoPath = await createTestRepo();
|
|
process.chdir(repoPath.path);
|
|
});
|
|
|
|
afterEach(async () => {
|
|
process.chdir(originalCwd);
|
|
await cleanupRepo(repoPath);
|
|
});
|
|
|
|
test("simple strategy applies uncommitted changes", async () => {
|
|
const src = await create("source");
|
|
|
|
await Bun.write(path.join(src.path, "new-file.txt"), "content");
|
|
|
|
await collapse("source", "main", { strategy: "simple" });
|
|
|
|
const mainPath = await getRepoRoot();
|
|
const content = await Bun.file(path.join(mainPath, "new-file.txt")).text();
|
|
expect(content).toBe("content");
|
|
});
|
|
|
|
test("rebase strategy handles divergent history", async () => {
|
|
const src = await create("source");
|
|
|
|
// Make a commit on main to create divergent history
|
|
const mainPath = await getRepoRoot();
|
|
await Bun.write(path.join(mainPath, "main-change.txt"), "main");
|
|
await git(["add", "main-change.txt"], mainPath);
|
|
await git(["commit", "-m", "main change"], mainPath);
|
|
|
|
// Add uncommitted changes on source (collapseRebase stages and commits these)
|
|
await Bun.write(path.join(src.path, "feature.txt"), "feature");
|
|
|
|
await collapse("source", "main", { strategy: "rebase" });
|
|
|
|
expect(await Bun.file(path.join(mainPath, "feature.txt")).exists()).toBe(true);
|
|
expect(await Bun.file(path.join(mainPath, "main-change.txt")).exists()).toBe(true);
|
|
});
|
|
});
|