Fix e2e

grafana · Sep 7, 2023 · 85935b6 · 85935b6
1 parent 407d486
commit 85935b6
Show file tree

Hide file tree

Showing 3 changed files with 734 additions and 694 deletions.
diff --git a/cypress/integration/02_variable_editor.spec.ts b/cypress/integration/02_variable_editor.spec.ts
@@ -28,11 +28,11 @@ e2e.scenario({
       })
       .then((ds) => {
         e2e.flows.addDashboard().then(() => {
-          openDashboardSettings('Variables');
+          e2e.components.PageToolbar.item('Dashboard settings').click();
+          e2e.components.Tab.title('Variables').click();
           e2e.pages.Dashboard.Settings.Variables.List.addVariableCTAV2().click();
-          e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInput().clear().type('variable1');
-          cy.wait(6 * 1000); // When clearing the variable name, the validation popup comes and hides the datasource picker. so wait sometime till the popup closes.
-          selectDropdown(e2e.pages.Dashboard.Settings.Variables.Edit.QueryVariable.queryOptionsDataSourceSelect(), ds.config.name);
+          e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('variable1');
+          e2e.components.DataSourcePicker.inputV2().type(`${ds.config.name}{enter}`);
           // Get list of projects
           selectDropdown(e2eSelectors.VariablesEditor.QueryType.container.ariaLabel(), 'Projects');
           cy.wait(2 * 1000);
@@ -44,7 +44,10 @@ e2e.scenario({
           selectDropdown(e2eSelectors.VariablesEditor.Project.container.ariaLabel(), SENTRY_E2E_PROJECT_NAME);
           cy.wait(2 * 1000);
           variableEditorPreviewValuesCheck([SENTRY_E2E_ENVIRONMENT_NAME], [SENTRY_E2E_NODE_ONLY_ENVIRONMENT_NAME]);
-          selectDropdown(e2eSelectors.VariablesEditor.Project.container.ariaLabel(), SENTRY_E2E_PRODUCTION_PROJECT_NAME);
+          selectDropdown(
+            e2eSelectors.VariablesEditor.Project.container.ariaLabel(),
+            SENTRY_E2E_PRODUCTION_PROJECT_NAME
+          );
           cy.wait(2 * 1000);
           variableEditorPreviewValuesCheck([SENTRY_E2E_ENVIRONMENT_NAME, SENTRY_E2E_NODE_ONLY_ENVIRONMENT_NAME]);
         });

diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.4",
-    "@grafana/e2e": "8.4.7",
-    "@grafana/e2e-selectors": "8.4.7",
+    "@grafana/e2e": "9.5.0",
+    "@grafana/e2e-selectors": "9.5.0",
     "@grafana/eslint-config": "^6.0.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@swc/core": "1.3.75",