From c8b4792f8d42c3ea013c453fa9d295f66022132d Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 15 May 2024 09:15:45 +0100
Subject: [PATCH] Fix integration tests

---
 ui-tests/tests/file-selection.spec.ts | 4 ++--
 ui-tests/tests/rebase.spec.ts         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui-tests/tests/file-selection.spec.ts b/ui-tests/tests/file-selection.spec.ts
index 9cafc61e6..722bb3f25 100644
--- a/ui-tests/tests/file-selection.spec.ts
+++ b/ui-tests/tests/file-selection.spec.ts
@@ -61,8 +61,8 @@ test.describe('File selection for simple staging', () => {
     // URL for merge conflict example repository
     await page.goto(`tree/${tmpPath}/test-repository`);
 
-    // Click [aria-label="main"] >> text=Git
-    await page.locator('[aria-label="main"] >> text=Git').click();
+    // Click Git menu
+    await page.locator('[aria-label="main menu"] >> text=Git').click();
     // Click text=Simple staging
     await page.getByRole('menuitem', { name: 'Simple staging' }).click();
   });
diff --git a/ui-tests/tests/rebase.spec.ts b/ui-tests/tests/rebase.spec.ts
index 3416182a9..51262fcae 100644
--- a/ui-tests/tests/rebase.spec.ts
+++ b/ui-tests/tests/rebase.spec.ts
@@ -58,13 +58,13 @@ test.describe('Rebase', () => {
     await expect.soft(banner).toHaveText(/Result/);
     await expect.soft(banner).toHaveText(/Incoming/);
 
-    await page.getByRole('button', { name: 'Mark as resolved' }).click();
+    await page.locator('button >> text="Mark as resolved"').click();
 
     await page
       .getByTitle('another_file.txt • Conflicted', { exact: true })
       .dblclick();
 
-    await page.getByRole('button', { name: 'Mark as resolved' }).click();
+    await page.locator('button >> text="Mark as resolved"').click();
 
     await page.getByTitle('example.ipynb • Conflicted').click({
       clickCount: 2
@@ -79,7 +79,7 @@ test.describe('Rebase', () => {
     await expect.soft(banner).toHaveText(/Current/);
     await expect.soft(banner).toHaveText(/Incoming/);
 
-    await page.getByRole('button', { name: 'Mark as resolved' }).click();
+    await page.locator('button >> text="Mark as resolved"').click();
 
     // Continue rebase as all conflicts are resolved
     await page.getByRole('button', { name: 'Continue' }).click();