From d6ebec692138d5dce351f1a26e55c293c6fb6d4a Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Tue, 17 Dec 2024 17:02:37 +0100
Subject: [PATCH] E2E: Fix selectors related to scenes powered dashboards
 (#98112)

* fix broken scenes selectors

* fix broken test
---
 packages/grafana-e2e-selectors/src/resolver.test.ts   | 2 +-
 packages/grafana-e2e-selectors/src/selectors/pages.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-e2e-selectors/src/resolver.test.ts b/packages/grafana-e2e-selectors/src/resolver.test.ts
index fe294800416..a306f9261ed 100644
--- a/packages/grafana-e2e-selectors/src/resolver.test.ts
+++ b/packages/grafana-e2e-selectors/src/resolver.test.ts
@@ -14,7 +14,7 @@ describe('Resolver', () => {
     );
     expect(pages.Alerting.AddAlertRule.url).toBe('/alerting/new/alerting');
     expect(pages.AddDashboard.Settings.Variables.Edit.url('test')).toBe(
-      '/dashboard/new?orgId=1&editview=templating&editIndex=test'
+      '/dashboard/new?orgId=1&editview=variables&editIndex=test'
     );
   });
 
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index becd0b28646..29c310d6aff 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -155,8 +155,9 @@ export const versionedPages = {
         },
         Edit: {
           url: {
-            [MIN_GRAFANA_VERSION]: (annotationIndex: string) =>
-              `/dashboard/new?orgId=1&editview=templating&editIndex=${annotationIndex}`,
+            '11.3.0': (editIndex: string) => `/dashboard/new?orgId=1&editview=variables&editIndex=${editIndex}`,
+            [MIN_GRAFANA_VERSION]: (editIndex: string) =>
+              `/dashboard/new?orgId=1&editview=templating&editIndex=${editIndex}`,
           },
         },
       },
@@ -344,6 +345,7 @@ export const versionedPages = {
       Variables: {
         List: {
           url: {
+            '11.3.0': (dashboardUid: string) => `/d/${dashboardUid}?editview=variables`,
             [MIN_GRAFANA_VERSION]: (dashboardUid: string) => `/d/${dashboardUid}?editview=templating`,
           },
           addVariableCTAV2: {
@@ -376,6 +378,7 @@ export const versionedPages = {
         },
         Edit: {
           urlParams: {
+            '11.3.0': (editIndex: string) => `editview=variables&editIndex=${editIndex}`,
             [MIN_GRAFANA_VERSION]: (editIndex: string) => `editview=templating&editIndex=${editIndex}`,
           },
           General: {