Fix integration tests

Author: fcollonval

ui-tests/tests/commit-diff.spec.ts

@@ -39,10 +39,10 @@ test.describe('Commits diff', () => {
 
   test('should display diff from single file history', async ({ page }) => {
     await page.sidebar.openTab('filebrowser');
-    await page.click('#filebrowser >> text=example.ipynb', {
+    await page.getByText('example.ipynb').click({
       button: 'right'
     });
-    await page.hover('ul[role="menu"] >> text=Git');
+    await page.getByRole('menu').getByText('Git').hover();
     await page.click('#jp-contextmenu-git >> text=History');
 
     await page.waitForSelector('#jp-git-sessions >> ol >> text=example.ipynb');

ui-tests/tests/git-stash.spec.ts

@@ -162,21 +162,19 @@ test.describe('Git Stash Commands', () => {
     // Show the stash entries and hover on the stash entry
     await page.getByText('Stash(2)').click();
     await page
-      .locator('span')
-      .filter({ hasText: 'stashy stash (on master)' })
+    .locator('div').filter({ hasText: /^stashy stash \(on master\)$/ }).last()
       .hover();
 
-    const applyStashBtn = await page
-      .locator('span')
-      .filter({ hasText: 'stashy stash (on master)' })
+    const applyStashBtn = page
+    .locator('div').filter({ hasText: /^stashy stash \(on master\)$/ }).last()
       .getByRole('button', { name: 'Apply stash entry' });
 
     await applyStashBtn.click();
 
     // Check that the stash applies
     await expect
-      .soft(await page.getByText('console.log("dirty changes");'))
-      .toBeTruthy();
+      .soft(page.getByText('console.log("dirty changes");'))
+      .toHaveCount(1);
 
     // open the second file has changes applied
     await page.getByRole('tab', { name: 'File Browser' }).click();
@@ -187,12 +185,12 @@ test.describe('Git Stash Commands', () => {
       .dblclick();
 
     await expect
-      .soft(await page.getByText('This is some dirty changes'))
-      .toBeTruthy();
+      .soft(page.getByText('This is some dirty changes'))
+      .toHaveCount(1);
 
     // See if the nStashes remains the same
-    const numberOfStashes = await page.locator('[data-test-id="num-stashes"]');
-    await expect(await numberOfStashes.innerText()).toBe('(2)');
+    const numberOfStashes = page.locator('[data-test-id="num-stashes"]');
+    await expect(numberOfStashes).toHaveText('(2)');
   });
 
   test('should pop a stash entry when the `stash pop` button is clicked (apply stash then remove from list)', async ({
@@ -219,16 +217,12 @@ test.describe('Git Stash Commands', () => {
     await page.getByText('Stash', { exact: true }).click();
 
     await page
-      .locator('span')
-      .filter({ hasText: 'stashy stash (on master)' })
+      .locator('div').filter({ hasText: /^stashy stash \(on master\)$/ }).last()
       .hover();
 
-    const popStashBtn = await page
-      .locator('span')
-      .filter({ hasText: 'stashy stash (on master)' })
-      .getByRole('button', { name: 'Pop stash entry' });
-
-    await popStashBtn.click();
+    await page
+      .locator('div').filter({ hasText: /^stashy stash \(on master\)$/ }).last()
+      .getByRole('button', { name: 'Pop stash entry' }).click();
 
     // Wait for the number of stashes to change
     await page.waitForFunction(() => {
@@ -237,11 +231,9 @@ test.describe('Git Stash Commands', () => {
     });
     await page.waitForTimeout(100);
     // Check that the stash applies
-    const firstStashFileText = await page
-      .locator('pre')
-      .filter({ hasText: 'console.log("dirty changes");' });
+    const firstStashFileText = page.getByText('console.log("dirty changes");');
 
-    await expect.soft(await firstStashFileText.count()).toBe(1);
+    await expect.soft(firstStashFileText).toHaveCount(1);
 
     // open the second file has changes applied
     await page.getByRole('tab', { name: 'File Browser' }).click();
@@ -254,11 +246,9 @@ test.describe('Git Stash Commands', () => {
     // Wait for revertFile to finish
     await page.waitForTimeout(100);
 
-    const secondStashFileText = await page
-      .locator('pre')
-      .filter({ hasText: 'This is some dirty changes' });
+    const secondStashFileText = page.getByText('This is some dirty changes');
 
-    await expect.soft(await secondStashFileText.count()).toBe(1);
+    await expect.soft(secondStashFileText).toHaveCount(1);
 
     // See if the nStashes remains the same
 
@@ -267,7 +257,7 @@ test.describe('Git Stash Commands', () => {
       return element && !(element.textContent ?? '').includes('(2)');
     });
 
-    const numberOfStashes = await page.locator('[data-test-id="num-stashes"]');
-    await expect(await numberOfStashes.innerText()).toBe('(1)');
+    const numberOfStashes = page.locator('[data-test-id="num-stashes"]');
+    await expect(numberOfStashes).toHaveText('(1)');
   });
 });

ui-tests/tests/image-diff.spec.ts-snapshots/jpeg-diff-linux.png

@@ -21,7 +21,7 @@ test.describe('Rebase', () => {
     await page.getByRole('button', { name: 'Current Branch master' }).click();
 
     // Switch to a-branch
-    await page.getByRole('button', { name: 'a-branch' }).click();
+    await page.getByRole('listitem', { name: 'Switch to branch: a-branch' }).click();
 
     // Hide branch panel
     await page.getByRole('button', { name: 'Current Branch a-branch' }).click();