chore(): sync with main

core/src/components/checkbox/test/basic/checkbox.e2e.ts

@@ -11,6 +11,7 @@ test.describe('checkbox: basic visual tests', () => {
     expect(await checkbox.screenshot()).toMatchSnapshot(`checkbox-unchecked-${page.getSnapshotSettings()}.png`);
   });
 
+<<<<<<< HEAD
   test('should render checked checkbox correctly', async ({ page }) => {
     await page.setContent(`
       <ion-checkbox checked>Checked</ion-checkbox>
@@ -96,5 +97,8 @@ 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
   });
 });

core/src/components/checkbox/test/indeterminate/checkbox.e2e.ts

@@ -7,7 +7,13 @@ 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
   });
 });