Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix integration tests #1327

Closed
wants to merge 1 commit into from
Closed

Fix integration tests #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui-tests/tests/file-selection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
6 changes: 3 additions & 3 deletions ui-tests/tests/rebase.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, galata, test } from '@jupyterlab/galata';

Check failure on line 1 in ui-tests/tests/rebase.spec.ts

View workflow job for this annotation

GitHub Actions / Integration tests

tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase 

  1) tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase ───────────────────────
    Test timeout of 60000ms exceeded.

Check failure on line 1 in ui-tests/tests/rebase.spec.ts

View workflow job for this annotation

GitHub Actions / Integration tests

tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase 

  1) tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase ───────────────────────
    Pending operations:
      - locator.click at tests/rebase.spec.ts:61:61
import path from 'path';
import { extractFile } from './utils';

Expand Down Expand Up @@ -58,13 +58,13 @@
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();

Check failure on line 61 in ui-tests/tests/rebase.spec.ts

View workflow job for this annotation

GitHub Actions / Integration tests

tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase 

  1) tests/rebase.spec.ts:46:7 › Rebase › should resolve a conflicted rebase ───────────────────────
    Error: locator.click: Page closed
    =========================== logs ===========================
    waiting for locator('button').locator('text="Mark as resolved"')
    ============================================================

      59 |     await expect.soft(banner).toHaveText(/Incoming/);
      60 |
    > 61 |     await page.locator('button >> text="Mark as resolved"').click();
         |                                                             ^
      62 |
      63 |     await page
      64 |       .getByTitle('another_file.txt • Conflicted', { exact: true })

        at /home/runner/work/jupyterlab-git/jupyterlab-git/ui-tests/tests/rebase.spec.ts:61:61

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
Expand All @@ -79,7 +79,7 @@
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();
Expand Down
Loading