Merge pull request #10965 from gitbutlerapp/testing-things

e2e: Fix running tests on chrome & delete project from multiple project setup

Author: estib-vega

e2e/package.json

@@ -2,7 +2,7 @@
 	"name": "@gitbutler/e2e",
 	"type": "module",
 	"devDependencies": {
-		"@playwright/test": "1.47.0",
+		"@playwright/test": "1.56.1",
 		"@types/node": "^24.3.0",
 		"@wdio/cli": "^9.18.4",
 		"@wdio/globals": "^9.17.0",

e2e/playwright/playwright.config.ts

@@ -56,10 +56,11 @@ function projects() {
 	}
 
 	projects.push({
-		name: 'chromium',
+		name: 'Chrome',
 		use: {
 			...devices['Desktop Chrome'],
-			viewport: { width: 1920, height: 1080 }
+			headless: false,
+			channel: 'chrome'
 		}
 	});
 

e2e/playwright/src/setup.ts

@@ -226,10 +226,9 @@ async function setProjectPathCookie(context: BrowserContext, workdir: string): P
 }
 
 /**
- * Set the project path cookie in the browser context.
+ * Set the butler server port cookie in the browser context.
  *
- * This is needed in order for the Frontend to be able to know the absolute paths of the
- * project files. The web file picker is not able to get absolute paths for security reasons.
+ * This is needed in order for the Frontend to know which port to use to connect to the butler server.
  */
 async function setButlerServerPort(context: BrowserContext): Promise<void> {
 	// Set the information about the workdir

e2e/playwright/tests/projectOffboarding.spec.ts

@@ -1,5 +1,5 @@
 import { getBaseURL, type GitButler, setCookie, startGitButler } from '../src/setup.ts';
-import { clickByTestId, waitForTestId, waitForTestIdToNotExist } from '../src/util.ts';
+import { clickByTestId, sleep, waitForTestId, waitForTestIdToNotExist } from '../src/util.ts';
 import { test } from '@playwright/test';
 
 let gitbutler: GitButler;
@@ -44,3 +44,42 @@ test('should be able to delete the last project gracefuly', async ({ page, conte
 
 	await waitForTestId(page, 'welcome-page');
 });
+
+test('should be able to delete a project when multiple exist', async ({
+	page,
+	context
+}, testInfo) => {
+	const workdir = testInfo.outputPath('workdir');
+	const configdir = testInfo.outputPath('config');
+	gitbutler = await startGitButler(workdir, configdir, context);
+
+	// Override the analytics confirmation so we don't see the page later
+	await setCookie('disk-store-override:appAnalyticsConfirmed', 'true', context);
+
+	await gitbutler.runScript('two-projects-with-remote-branches.sh');
+
+	await page.goto('/');
+
+	// Should load the workspace
+	await waitForTestId(page, 'workspace-view');
+
+	// Open project settings
+	await clickByTestId(page, 'chrome-sidebar-project-settings-button');
+
+	await waitForTestId(page, 'project-settings-modal');
+
+	const deleteProjectButton = await waitForTestId(page, 'project-delete-button');
+	await deleteProjectButton.scrollIntoViewIfNeeded();
+	await deleteProjectButton.click();
+
+	await clickByTestId(page, 'project-delete-modal-confirm');
+
+	await waitForTestIdToNotExist(page, 'project-delete-modal-confirm');
+	await waitForTestIdToNotExist(page, 'project-delete-button');
+	await waitForTestIdToNotExist(page, 'project-settings-modal');
+
+	// Should still be in the workspace
+	await waitForTestId(page, 'workspace-view');
+
+	await sleep(10000); // Wait for the project list to update
+});