Adapt integration tests

Author: estib-vega

apps/desktop/cypress/e2e/support/index.ts

@@ -180,6 +180,11 @@ Cypress.on('window:before:load', (win) => {
 				return await Promise.resolve({});
 			case 'plugin:log|log':
 				return await Promise.resolve({});
+			case 'plugin:window|title':
+			case 'plugin:app|name':
+				return 'GitButler';
+			case 'plugin:app|version':
+				return '0.0.0';
 			default:
 				return raiseMissingMockError(command);
 		}

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

@@ -84,27 +84,27 @@ describe('Upstream Integration', () => {
 			projectId: PROJECT_ID,
 			resolutions: [
 				{
-					branchId: 'stack-a-id',
+					stackId: 'stack-a-id',
 					approach: { type: 'rebase' },
 					deleteIntegratedBranches: true,
 					forceIntegratedBranches: []
 				},
 				{
-					branchId: 'stack-b-id',
+					stackId: 'stack-b-id',
 					approach: { type: 'delete' },
 					deleteIntegratedBranches: false,
 					forceIntegratedBranches: []
 				},
 				{
-					branchId: 'stack-c-id',
+					stackId: 'stack-c-id',
 					approach: {
 						type: 'delete'
 					},
 					deleteIntegratedBranches: true,
 					forceIntegratedBranches: []
 				}
 			],
-			branchResolution: undefined
+			baseBranchResolution: undefined
 		});
 	});
 });