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

feat(checkout): add merge-from-base and push operations for worktree branches

Browse Source
This commit is contained in:
Mohamed Boudra
2026-01-24 21:24:48 +07:00
parent 56399bcb42
commit 8fe30eae75
19 changed files with 947 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/e2e/checkout-ship.spec.ts
+6 -8
View File
@@ -232,14 +232,12 @@ test('checkout-first Changes panel ship loop', async ({ page }) => {
]);
const normalizedRepo = normalizeTmpPath(resolvedRepo);
const normalizedCwd = normalizeTmpPath(resolvedCwd);
const expectedRoot = path.join(normalizedRepo, '.paseo', 'worktrees');
const expectedRootRaw = normalizeTmpPath(
path.join(repo.path, '.paseo', 'worktrees')
);
expect(
normalizedCwd.startsWith(expectedRoot) ||
normalizedCwd.startsWith(expectedRootRaw)
).toBeTruthy();
const expectedMarker = `${path.sep}.paseo${path.sep}worktrees${path.sep}`;
expect(normalizedCwd.includes(expectedMarker)).toBeTruthy();
if (repo.name) {
const expectedProjectRoot = path.join('.paseo', 'worktrees', repo.name);
expect(normalizedCwd.includes(expectedProjectRoot)).toBeTruthy();
}
await page.getByTestId('sidebar-new-agent').click();
await expect(page).toHaveURL(/\/$/);