ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-01 20:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: normalize worktree paths and update branch listing logic

Browse Source 
- Updated the branch listing command to remove quotes around branch names, ensuring compatibility across platforms.
- Enhanced worktree path comparisons in tests to normalize path separators, improving consistency between server and client environments.
- Adjusted workspace root resolution to reflect the correct directory structure for the UI.

This addresses potential discrepancies in branch names and worktree paths, particularly on Windows systems.
This commit is contained in:
Kacper
2025-12-17 22:52:40 +01:00
parent bfc8f9bc26
commit 76cb72812f
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/ui/tests/worktree-integration.spec.ts
View File

@@ -830,7 +830,8 @@ test.describe("Worktree Integration Tests", () => {
const featureFilePath = path.join(featuresDir, featureDir!, "feature.json");
const featureData = JSON.parse(fs.readFileSync(featureFilePath, "utf-8"));
expect(featureData.branchName).toBe(branchName);
expect(featureData.worktreePath).toBe(expectedWorktreePath);
// Normalize paths for comparison (server returns forward slashes, path.join returns native)
expect(path.normalize(featureData.worktreePath)).toBe(path.normalize(expectedWorktreePath));
});
test("should reset feature branch and worktree when worktree is deleted", async ({
@@ -888,7 +889,8 @@ test.describe("Worktree Integration Tests", () => {
let featureFilePath = path.join(featuresDir, featureDir!, "feature.json");
let featureData = JSON.parse(fs.readFileSync(featureFilePath, "utf-8"));
expect(featureData.branchName).toBe(branchName);
expect(featureData.worktreePath).toBe(worktreePath);
// Normalize paths for comparison (server returns forward slashes, path.join returns native)
expect(path.normalize(featureData.worktreePath)).toBe(path.normalize(worktreePath));
// Delete the worktree via UI
// Open the worktree actions menu
@@ -2428,7 +2430,8 @@ test.describe("Worktree Integration Tests", () => {
// Verify feature was updated with correct branch and worktreePath
featureData = JSON.parse(fs.readFileSync(featureFilePath, "utf-8"));
expect(featureData.branchName).toBe(newBranchName);
expect(featureData.worktreePath).toBe(expectedWorktreePath);
// Normalize paths for comparison (server returns forward slashes, path.join returns native)
expect(path.normalize(featureData.worktreePath)).toBe(path.normalize(expectedWorktreePath));
});
test("should not create worktree when editing a feature and selecting main branch", async ({
@@ -2586,6 +2589,7 @@ test.describe("Worktree Integration Tests", () => {
const featureFilePath = path.join(featuresDir, featureDir!, "feature.json");
const featureData = JSON.parse(fs.readFileSync(featureFilePath, "utf-8"));
expect(featureData.branchName).toBe(existingBranch);
expect(featureData.worktreePath).toBe(existingWorktreePath);
// Normalize paths for comparison (server returns forward slashes, path.join returns native)
expect(path.normalize(featureData.worktreePath)).toBe(path.normalize(existingWorktreePath));
});
});