Skip to content

Commit 3b21b30

Browse files
committed
test(git): trim dirty-worktree create PR coverage
1 parent 94908f2 commit 3b21b30

2 files changed

Lines changed: 3 additions & 47 deletions

File tree

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3789,12 +3789,6 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
37893789
expect(
37903790
(yield* runGit(remoteDir, ["rev-parse", "feature/create-pr-only"])).stdout.trim(),
37913791
).toBe(headBefore);
3792-
expect(NodeFS.readFileSync(NodePath.join(repoDir, "README.md"), "utf8")).toBe(
3793-
"uncommitted readme\n",
3794-
);
3795-
expect(NodeFS.readFileSync(NodePath.join(repoDir, "untracked.txt"), "utf8")).toBe(
3796-
"untracked work\n",
3797-
);
37983792
expect(
37993793
ghCalls.some((call) =>
38003794
call.includes("pr create --base main --head feature/create-pr-only"),
@@ -6279,26 +6273,12 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
62796273
expect(result.commit.status).toBe("skipped_not_requested");
62806274
expect(result.push.status).toBe("skipped_not_requested");
62816275
expect(result.pr.status).toBe("created");
6282-
expect(generatedContent?.commitSummary).toContain("PR only branch");
6283-
expect(generatedContent?.diffSummary).toContain("pr-only.txt");
6284-
expect(generatedContent?.diffSummary).not.toContain("README.md");
6285-
expect(generatedContent?.diffSummary).not.toContain("untracked.txt");
62866276
expect(generatedContent?.diffPatch).toContain("+pr only");
62876277
expect(generatedContent?.diffPatch).not.toContain("staged readme");
62886278
expect(generatedContent?.diffPatch).not.toContain("unstaged feature work");
6289-
expect(generatedContent?.diffPatch).not.toContain("untracked work");
62906279
expect((yield* runGit(repoDir, ["rev-parse", "HEAD"])).stdout).toBe(headBefore);
62916280
expect((yield* runGit(repoDir, ["status", "--porcelain"])).stdout).toBe(statusBefore);
62926281
expect((yield* runGit(repoDir, ["diff", "--cached"])).stdout).toBe(stagedBefore);
6293-
expect(NodeFS.readFileSync(NodePath.join(repoDir, "README.md"), "utf8")).toBe(
6294-
"staged readme\n",
6295-
);
6296-
expect(NodeFS.readFileSync(NodePath.join(repoDir, "pr-only.txt"), "utf8")).toBe(
6297-
"unstaged feature work\n",
6298-
);
6299-
expect(NodeFS.readFileSync(NodePath.join(repoDir, "untracked.txt"), "utf8")).toBe(
6300-
"untracked work\n",
6301-
);
63026282
expect(
63036283
events.filter(
63046284
(event): event is Extract<GitActionProgressEvent, { kind: "phase_started" }> =>

‎apps/web/src/components/GitActionsControl.logic.test.ts‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import type { VcsStatusResult } from "@t3tools/contracts";
2-
import {
3-
buildMenuItems as buildMobileMenuItems,
4-
getGitActionDisabledReason,
5-
} from "@t3tools/client-runtime/state/vcs";
62
import { assert, describe, it } from "vite-plus/test";
73
import {
84
buildGitActionProgressStages,
@@ -369,7 +365,7 @@ describe("when: source control provider uses merge requests", () => {
369365
});
370366

371367
describe("when: ref is clean, up to date, and has no open PR", () => {
372-
it("enables create PR when synced with upstream but ahead of default, including dirty worktrees", () => {
368+
it("enables create PR when synced with upstream but ahead of default, even with local changes", () => {
373369
const syncedFeature = status({
374370
aheadCount: 0,
375371
behindCount: 0,
@@ -389,29 +385,9 @@ describe("when: ref is clean, up to date, and has no open PR", () => {
389385
assert.equal(items.find((item) => item.id === "pr")?.disabled, false);
390386

391387
const dirtyFeature = { ...syncedFeature, hasWorkingTreeChanges: true };
392-
assert.equal(buildMenuItems(dirtyFeature, false)[2]?.disabled, false);
393-
const mobileItem = buildMobileMenuItems(dirtyFeature, false)[2]!;
394-
assert.isFalse(mobileItem.disabled);
395-
assert.isNull(
396-
getGitActionDisabledReason({
397-
item: mobileItem,
398-
gitStatus: dirtyFeature,
399-
isBusy: false,
400-
hasOriginRemote: true,
401-
}),
402-
);
403-
assert.equal(buildMobileMenuItems(dirtyFeature, true)[2]?.disabled, true);
404-
const behindFeature = { ...dirtyFeature, behindCount: 1 };
405-
const behindItem = buildMobileMenuItems(behindFeature, false)[2]!;
406-
assert.isTrue(behindItem.disabled);
407388
assert.equal(
408-
getGitActionDisabledReason({
409-
item: behindItem,
410-
gitStatus: behindFeature,
411-
isBusy: false,
412-
hasOriginRemote: true,
413-
}),
414-
"Branch is behind upstream. Pull/rebase before creating a PR.",
389+
buildMenuItems(dirtyFeature, false).find((item) => item.id === "pr")?.disabled,
390+
false,
415391
);
416392
});
417393

0 commit comments

Comments
 (0)