Skip to content

Commit d2c6c06

Browse files
committed
refactor(mock rename branchName -> branch and use full ref names
Update mock backend and test helpers to use a single "branch" field containing the git ref (e.g. refs/heads/<name>) instead of the previous branchName/remote split. Adjust type guards, invocation points, and fixtures so branch refs are constructed where needed (selection tests and branch-change scenario data). Improve error messaging in the mock getBranchChanges to include the incoming args for easier debugging. This clarifies parameter semantics (full ref vs name), reduces fragile remote handling, and aligns tests and fixtures with how branch refs are consumed by the mock backend.
1 parent f1d7d6d commit d2c6c06

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

apps/desktop/cypress/e2e/selection.cy.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ describe('Selection', () => {
5151
.scrollIntoView()
5252
.should('be.visible')
5353
.within(() => {
54-
const changedFileNames = mockBackend.getBranchChangesFileNames(stackId, stackName);
54+
const branch = `refs/heads/${stackName}`;
55+
const changedFileNames = mockBackend.getBranchChangesFileNames(stackId, branch);
5556
for (const fileName of changedFileNames) {
5657
cy.getByTestId('file-list-item', fileName).should('be.visible');
5758
}

apps/desktop/cypress/e2e/support/mock/backend.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,10 @@ export default class MockBackend {
442442

443443
public getBranchChanges(args: InvokeArgs | undefined): TreeChanges {
444444
if (!args || !isGetBranchChangesParams(args)) {
445-
throw new Error('Invalid arguments for getBranchChanges');
445+
throw new Error('Invalid arguments for getBranchChanges: ' + JSON.stringify(args));
446446
}
447447

448-
const { stackId, branchName } = args;
448+
const { stackId, branch } = args;
449449

450450
if (!stackId) {
451451
return {
@@ -463,9 +463,9 @@ export default class MockBackend {
463463
throw new Error(`No changes found for stack with ID ${stackId}`);
464464
}
465465

466-
const branchChanges = stackBranchChanges.get(branchName);
466+
const branchChanges = stackBranchChanges.get(branch);
467467
if (!branchChanges) {
468-
throw new Error(`No changes found for branch with name ${branchName}`);
468+
throw new Error(`No changes found for branch with name ${branch}`);
469469
}
470470

471471
return {
@@ -480,10 +480,10 @@ export default class MockBackend {
480480

481481
public getBranchChangesFileNames(
482482
stackId: string,
483-
branchName: string,
483+
branch: string,
484484
projectId: string = PROJECT_ID
485485
): string[] {
486-
const changes = this.getBranchChanges({ projectId, stackId, branchName });
486+
const changes = this.getBranchChanges({ projectId, stackId, branch });
487487
return changes.changes.map((change) => change.path).map((path) => path.split('/').pop()!);
488488
}
489489

apps/desktop/cypress/e2e/support/mock/changes.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ export function isGetCommitChangesParams(args: unknown): args is GetCommitChange
148148
export type GetBranchChangesParams = {
149149
projectId: string;
150150
stackId?: string;
151-
branchName: string;
152-
remote?: string;
151+
branch: string;
153152
};
154153

155154
export function isGetBranchChangesParams(args: unknown): args is GetBranchChangesParams {
@@ -159,9 +158,8 @@ export function isGetBranchChangesParams(args: unknown): args is GetBranchChange
159158
'projectId' in args &&
160159
typeof args['projectId'] === 'string' &&
161160
(typeof (args as any).stackId === 'string' || (args as any).stackId === undefined) &&
162-
'branchName' in args &&
163-
typeof args['branchName'] === 'string' &&
164-
(typeof (args as any).remote === 'string' || (args as any).remote === undefined)
161+
'branch' in args &&
162+
typeof args['branch'] === 'string'
165163
);
166164
}
167165

apps/desktop/cypress/e2e/support/scenarios/branchesWithChanges.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,13 +635,16 @@ export default class BranchesWithChanges extends MockBackend {
635635
this.stackDetails.set(MOCK_STACK_C_ID, MOCK_STACK_DETAILS_C);
636636

637637
const stackAChanges = new Map<string, TreeChange[]>();
638-
stackAChanges.set(MOCK_STACK_A_ID, MOCK_BRANCH_A_CHANGES);
638+
const branchARef = `refs/heads/${MOCK_STACK_A_ID}`;
639+
stackAChanges.set(branchARef, MOCK_BRANCH_A_CHANGES);
639640

640641
const stackBChanges = new Map<string, TreeChange[]>();
641-
stackBChanges.set(MOCK_STACK_B_ID, MOCK_BRANCH_B_CHANGES);
642+
const branchBRef = `refs/heads/${MOCK_STACK_B_ID}`;
643+
stackBChanges.set(branchBRef, MOCK_BRANCH_B_CHANGES);
642644

643645
const stackCChanges = new Map<string, TreeChange[]>();
644-
stackCChanges.set(MOCK_STACK_C_ID, MOCK_BRANCH_C_CHANGES);
646+
const branchCRef = `refs/heads/${MOCK_STACK_C_ID}`;
647+
stackCChanges.set(branchCRef, MOCK_BRANCH_C_CHANGES);
645648

646649
this.branchChanges.set(MOCK_STACK_A_ID, stackAChanges);
647650
this.branchChanges.set(MOCK_STACK_B_ID, stackBChanges);

0 commit comments

Comments
 (0)