Update cypress tests

Author: Caleb-T-Owens

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

@@ -15,6 +15,7 @@ describe('Branch Actions', () => {
 		mockCommand('update_branch_name', (params) => mockBackend.renameBranch(params));
 		mockCommand('remove_branch', (params) => mockBackend.removeBranch(params));
 		mockCommand('create_branch', (params) => mockBackend.addBranch(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -24,6 +24,7 @@ describe('Branches', () => {
 			mockBackend.createVirtualBranchFromBranch(args)
 		);
 		mockCommand('delete_local_branch', (params) => mockBackend.deleteLocalBranch(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -12,6 +12,7 @@ describe('Commit Actions', () => {
 		mockCommand('update_commit_message', (params) => mockBackend.updateCommitMessage(params));
 		mockCommand('changes_in_worktree', (params) => mockBackend.getWorktreeChanges(params));
 		mockCommand('tree_change_diffs', (params) => mockBackend.getDiff(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 		mockCommand('commit_details', (params) => mockBackend.getCommitChanges(params));
 		mockCommand('create_commit_from_worktree_changes', (params) =>
 			mockBackend.createCommit(params)
@@ -467,6 +468,7 @@ describe('Commit Actions with lots of uncommitted changes', () => {
 			mockBackend.createCommit(params)
 		);
 		mockCommand('undo_commit', (params) => mockBackend.undoCommit(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 
@@ -825,6 +827,7 @@ describe('Commit Actions with no stacks', () => {
 				return params.name;
 			}
 		});
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -27,6 +27,7 @@ describe('Error handling - commit actions', () => {
 		mockCommand('hunk_dependencies_for_workspace_changes', (params) =>
 			mockBackend.getHunkDependencies(params)
 		);
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -10,6 +10,7 @@ describe('File Tree - multiple file changes', () => {
 		mockCommand('stacks', () => mockBackend.getStacks());
 		mockCommand('stack_details', (params) => mockBackend.getStackDetails(params));
 		mockCommand('changes_in_worktree', (params) => mockBackend.getWorktreeChanges(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 
@@ -50,6 +51,7 @@ describe('File Tree - some file changes', () => {
 		mockCommand('stacks', () => mockBackend.getStacks());
 		mockCommand('stack_details', (params) => mockBackend.getStackDetails(params));
 		mockCommand('changes_in_worktree', (params) => mockBackend.getWorktreeChanges(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -21,6 +21,7 @@ describe('Review', () => {
 		mockCommand('push_stack', (params) => mockBackend.pushStack(params));
 		mockCommand('list_remotes', (params) => mockBackend.listRemotes(params));
 		mockCommand('update_branch_pr_number', (params) => mockBackend.updateBranchPrNumber(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.intercept(
 			{

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

@@ -12,6 +12,7 @@ describe('Selection', () => {
 		mockCommand('stacks', () => mockBackend.getStacks());
 		mockCommand('stack_details', (params) => mockBackend.getStackDetails(params));
 		mockCommand('changes_in_branch', (args) => mockBackend.getBranchChanges(args));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 
@@ -65,6 +66,7 @@ describe('Selection with upstream changes', () => {
 		mockCommand('stacks', () => mockBackend.getStacks());
 		mockCommand('stack_details', (params) => mockBackend.getStackDetails(params));
 		mockCommand('changes_in_branch', (args) => mockBackend.getBranchChanges(args));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 

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

@@ -40,6 +40,7 @@ import type { Commit } from '$lib/branches/v3';
 import type { HunkDependencies } from '$lib/dependencies/dependencies';
 import type { TreeChange, TreeChanges, WorktreeChanges } from '$lib/hunks/change';
 import type { UnifiedDiff } from '$lib/hunks/diff';
+import type { HunkAssignment } from '$lib/hunks/hunk';
 import type { GitRemote } from '$lib/remotes/remotesService';
 import type { BranchDetails, Stack, StackDetails } from '$lib/stacks/stack';
 import type { BranchPushResult } from '$lib/stacks/stackService.svelte';
@@ -161,6 +162,59 @@ export default class MockBackend {
 		return this.worktreeChanges;
 	}
 
+	public getHunkAssignments(args: InvokeArgs | undefined): HunkAssignment[] {
+		if (!args || !isGetWorktreeChangesParams(args)) {
+			throw new Error('Invalid arguments for getHunkAssignments');
+		}
+
+		const out = [];
+
+		for (const change of this.worktreeChanges.changes) {
+			if (change.status.type === 'Addition' || change.status.type === 'Deletion') {
+				out.push({
+					hunkHeader: null,
+					path: change.path,
+					pathBytes: change.pathBytes,
+					stackId: null,
+					hunkLocks: []
+				});
+			} else if (change.status.type === 'Rename' || change.status.type === 'Modification') {
+				const diff = this.getDiff({ projectId: args.projectId, change });
+				if (diff) {
+					if (diff.type === 'Binary' || diff.type === 'TooLarge') {
+						out.push({
+							hunkHeader: null,
+							path: change.path,
+							pathBytes: change.pathBytes,
+							stackId: null,
+							hunkLocks: []
+						});
+					} else {
+						for (const hunk of diff.subject.hunks) {
+							out.push({
+								hunkHeader: hunk,
+								path: change.path,
+								pathBytes: change.pathBytes,
+								stackId: null,
+								hunkLocks: []
+							});
+						}
+					}
+				} else {
+					out.push({
+						hunkHeader: null,
+						path: change.path,
+						pathBytes: change.pathBytes,
+						stackId: null,
+						hunkLocks: []
+					});
+				}
+			}
+		}
+
+		return out;
+	}
+
 	public getWorktreeChangesFileNames(): string[] {
 		return this.worktreeChanges.changes
 			.map((change) => change.path)

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

@@ -81,6 +81,15 @@ export type GetWorktreeChangesParams = {
 	projectId: string;
 };
 
+export function hasProjectId(args: unknown): args is { projectId: string } {
+	return (
+		typeof args === 'object' &&
+		args !== null &&
+		'projectId' in args &&
+		typeof args['projectId'] === 'string'
+	);
+}
+
 export function isGetWorktreeChangesParams(args: unknown): args is GetWorktreeChangesParams {
 	return (
 		typeof args === 'object' &&

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

@@ -16,6 +16,7 @@ describe('Unified Diff View', () => {
 		mockCommand('hunk_dependencies_for_workspace_changes', (params) =>
 			mockBackend.getHunkDependencies(params)
 		);
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 	});
@@ -259,6 +260,7 @@ describe('Unified Diff View with complex hunks', () => {
 		mockCommand('create_commit_from_worktree_changes', (params) =>
 			mockBackend.createCommit(params)
 		);
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');
 	});

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

@@ -14,6 +14,7 @@ describe('Upstream Integration', () => {
 			mockBackend.getUpstreamIntegrationStatuses()
 		);
 		mockCommand('integrate_upstream', (params) => mockBackend.integrateUpstream(params));
+		mockCommand('hunk_assignments', (params) => mockBackend.getHunkAssignments(params));
 
 		cy.visit('/');