-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2f0c336
commit b45b11f
Showing
6 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file modified
BIN
-2.74 KB
(96%)
...-diff-test3.spec.ts-snapshots/diff-test3-take-a-snapshot-at-opening-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,28 @@ | ||
import { expect, test } from '@playwright/test'; | ||
|
||
test.beforeEach(async ({ page }) => { | ||
await page.goto('http://localhost:41000/merge'); | ||
await page.locator('#merge-local').fill('data/merge_test10/left.ipynb'); | ||
await page.locator('#merge-base').fill('data/merge_test10/center.ipynb'); | ||
await page.locator('#merge-remote').fill('data/merge_test10/right.ipynb'); | ||
await page.getByRole('button', { name: 'Merge files' }).click(); | ||
}); | ||
|
||
/* notebooks of same length and 1 conflict*/ | ||
test.describe('merge test10', () => { | ||
test('should synchronize the collapse status between editor', async ({ page }) => { | ||
expect.soft(await page.locator('#main').screenshot()).toMatchSnapshot(); | ||
|
||
// Should display 4 collapsers | ||
const collapsers = page.getByText('4 unchanged lines'); | ||
await expect.soft(collapsers).toHaveCount(4); | ||
await expect.soft(page.getByText('gaussian array y')).toHaveCount(0); | ||
|
||
// Click on the base editor collapser | ||
await page.getByText('4 unchanged lines').nth(1).click(); | ||
|
||
// Should not display any collapsers | ||
await expect.soft(collapsers).toHaveCount(0); | ||
await expect(page.getByText('gaussian array y')).toHaveCount(4); | ||
}); | ||
}); |
Binary file added
BIN
+145 KB
.../merge-test10-should-synchronize-the-collapse-status-between-editor-1-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.