-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Improve `findAlignedLines` * Improve gutter selector * Update Playwright Snapshots * Fix integration test --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
- Loading branch information
1 parent
1256224
commit 22a5846
Showing
9 changed files
with
77 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { expect, test } from '@playwright/test'; | ||
|
||
test.describe('merge test5', () => { | ||
test.beforeEach(async ({ page }) => { | ||
await page.goto('http://localhost:41000/merge'); | ||
await page.locator('#merge-local').fill('data/merge_test5/left.ipynb'); | ||
await page.locator('#merge-base').fill('data/merge_test5/center.ipynb'); | ||
await page.locator('#merge-remote').fill('data/merge_test5/right.ipynb'); | ||
await page.getByRole('button', { name: 'Merge files' }).click(); | ||
}); | ||
|
||
test('take a snapshot at opening', async ({ page }) => { | ||
await expect.soft(page.getByText('➭')).toHaveCount(16); | ||
expect.soft(await page.locator('#main').screenshot()).toMatchSnapshot(); | ||
}); | ||
}); |
Binary file added
BIN
+202 KB
...erge-test5.spec.ts-snapshots/merge-test5-take-a-snapshot-at-opening-1-linux.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+120 KB
...erge-test5.spec.ts-snapshots/merge-test5-take-a-snapshot-at-opening-1-win32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.