From 56c18751b9e46f4e77c6c40c37685461cead509b Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Thu, 7 Aug 2025 14:14:33 +0200
Subject: [PATCH 1/3] test(plugin-e2e): update goto test as we no longer use
 networkIdle as default

---
 .../as-admin-user/page-loading/goto.spec.ts   | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts b/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
index 552d8995d9..1a98e195e5 100644
--- a/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
+++ b/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
@@ -1,40 +1,22 @@
 import { test, expect } from '../../../src';
 
 test.describe('gotoDashboardPage', () => {
-  test('should not display elements when waitUntil `load` is used', async ({
+  test('should display elements when waitUntil `load` (default) is used', async ({
     gotoDashboardPage,
     readProvisionedDashboard,
   }) => {
     const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.json' });
-    const dashboardPage = await gotoDashboardPage({ ...dashboard, waitUntil: 'load' });
-    await expect(dashboardPage.getPanelByTitle('Table data').locator).toHaveCount(0);
-  });
-
-  test('should not display elements when waitUntil `networkidle` (default) is used', async ({
-    gotoDashboardPage,
-    readProvisionedDashboard,
-  }) => {
-    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.json' });
-    const dashboardPage = await gotoDashboardPage(dashboard);
+    const dashboardPage = await gotoDashboardPage({ ...dashboard });
     await expect(dashboardPage.getPanelByTitle('Table data').locator).toBeVisible();
   });
 });
 
 test.describe('gotoPanelEditPage', () => {
-  test('should not display elements when waitUntil `load` is used', async ({
+  test('should display elements when waitUntil `load` (default) is used', async ({
     gotoPanelEditPage,
     readProvisionedDashboard,
   }) => {
-    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.json' });
-    const panelEditPage = await gotoPanelEditPage({ dashboard, id: '3', waitUntil: 'load' });
-    await expect(panelEditPage.panel.locator).toHaveCount(0);
-  });
-
-  test('should not display elements when waitUntil `networkidle` (default) is used', async ({
-    gotoPanelEditPage,
-    readProvisionedDashboard,
-  }) => {
-    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.json' });
+    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.jsonnpm' });
     const panelEditPage = await gotoPanelEditPage({ dashboard, id: '3' });
     await expect(panelEditPage.panel.locator).toBeVisible();
   });

From 67b7c85cd650e64d3b49eab6fa0960b4d96e6520 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Thu, 7 Aug 2025 14:15:31 +0200
Subject: [PATCH 2/3] fix(plugin-e2e): align colorpicker container selector
 with e2e-selectors version

---
 packages/plugin-e2e/src/models/components/ColorPicker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugin-e2e/src/models/components/ColorPicker.ts b/packages/plugin-e2e/src/models/components/ColorPicker.ts
index a076be4436..845f563ad2 100644
--- a/packages/plugin-e2e/src/models/components/ColorPicker.ts
+++ b/packages/plugin-e2e/src/models/components/ColorPicker.ts
@@ -28,7 +28,7 @@ export class ColorPicker extends ComponentBase {
 
   private getContainer(): Locator {
     const { grafanaVersion, page, selectors } = this.ctx;
-    if (gte(grafanaVersion, '11.4.1')) {
+    if (gte(grafanaVersion, '11.5.0')) {
       return page.locator(resolveGrafanaSelector(selectors.components.Portal.container));
     }
     if (gte(grafanaVersion, '8.7.0')) {

From 91cdaebd45fb3745fe5a6de599379d1afdd62ea7 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Thu, 7 Aug 2025 14:26:31 +0200
Subject: [PATCH 3/3] revert(plugin-e2e): remove typo

---
 .../plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts b/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
index 1a98e195e5..683c67b0e5 100644
--- a/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
+++ b/packages/plugin-e2e/tests/as-admin-user/page-loading/goto.spec.ts
@@ -16,7 +16,7 @@ test.describe('gotoPanelEditPage', () => {
     gotoPanelEditPage,
     readProvisionedDashboard,
   }) => {
-    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.jsonnpm' });
+    const dashboard = await readProvisionedDashboard({ fileName: 'testdatasource.json' });
     const panelEditPage = await gotoPanelEditPage({ dashboard, id: '3' });
     await expect(panelEditPage.panel.locator).toBeVisible();
   });