javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): update merge conflict in tests

Browse Source
This commit is contained in:
Liam DeBeasi
2023-02-22 10:18:36 -05:00
parent 799871e95d
commit b4c24d250d
6 changed files with 35 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/components/checkbox/test/basic/checkbox.e2e.ts
View File

@ -8,17 +8,16 @@ test.describe('checkbox: basic visual tests', () => {
`);
const checkbox = page.locator('ion-checkbox');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-unchecked-${page.getSnapshotSettings()}.png`);
await expect(checkbox).toHaveScreenshot(`checkbox-unchecked-${page.getSnapshotSettings()}.png`);
});
<<<<<<< HEAD
test('should render checked checkbox correctly', async ({ page }) => {
await page.setContent(`
<ion-checkbox checked>Checked</ion-checkbox>
`);
const checkbox = page.locator('ion-checkbox');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-checked-${page.getSnapshotSettings()}.png`);
await expect(checkbox).toHaveScreenshot(`checkbox-checked-${page.getSnapshotSettings()}.png`);
});
test('should render disabled checkbox correctly', async ({ page }) => {
@ -27,7 +26,7 @@ test.describe('checkbox: basic visual tests', () => {
`);
const checkbox = page.locator('ion-checkbox');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-disabled-${page.getSnapshotSettings()}.png`);
await expect(checkbox).toHaveScreenshot(`checkbox-disabled-${page.getSnapshotSettings()}.png`);
});
test('should render custom checkmark-width correctly', async ({ page }) => {
@ -36,7 +35,7 @@ test.describe('checkbox: basic visual tests', () => {
`);
const checkbox = page.locator('ion-checkbox');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-checkmark-width-${page.getSnapshotSettings()}.png`);
await expect(checkbox).toHaveScreenshot(`checkbox-checkmark-width-${page.getSnapshotSettings()}.png`);
});
test('should render custom size correctly', async ({ page }) => {
@ -45,7 +44,7 @@ test.describe('checkbox: basic visual tests', () => {
`);
const checkbox = page.locator('ion-checkbox');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-size-${page.getSnapshotSettings()}.png`);
await expect(checkbox).toHaveScreenshot(`checkbox-size-${page.getSnapshotSettings()}.png`);
});
});
@ -97,8 +96,5 @@ test.describe('checkbox: ionChange', () => {
await checkbox.evaluate((el: HTMLIonCheckboxElement) => (el.checked = true));
expect(ionChange).not.toHaveReceivedEvent();
=======
await expect(page).toHaveScreenshot(`checkbox-basic-${page.getSnapshotSettings()}.png`);
>>>>>>> origin/main
});
});

8
core/src/components/checkbox/test/indeterminate/checkbox.e2e.ts
View File

@ -7,13 +7,7 @@ test.describe('checkbox: indeterminate', () => {
await page.goto(`/src/components/checkbox/test/indeterminate`);
<<<<<<< HEAD
const checkbox = page.locator('ion-checkbox:first-child');
expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-indeterminate-${page.getSnapshotSettings()}.png`);
=======
await page.setIonViewport();
await expect(page).toHaveScreenshot(`checkbox-indeterminate-${page.getSnapshotSettings()}.png`);
>>>>>>> origin/main
await expect(checkbox).toHaveScreenshot(`checkbox-indeterminate-${page.getSnapshotSettings()}.png`);
});
});