@grafana/plugin-e2e 3.9.1 → 3.9.2

package/dist/fixtures/scripts/overrideGrafanaBootData.js

@@ -12,17 +12,11 @@ const overrideGrafanaBootData = ({ featureToggles, userPreferences }) => {
   waitForGrafanaBootData(() => {
     if (Object.keys(featureToggles).length > 0) {
       console.log("@grafana/plugin-e2e: setting the following feature toggles", featureToggles);
-      window.grafanaBootData.settings.featureToggles = {
-        ...window.grafanaBootData.settings.featureToggles,
-        ...featureToggles
-      };
+      Object.assign(window.grafanaBootData.settings.featureToggles, featureToggles);
     }
     if (Object.keys(userPreferences).length > 0) {
       console.log("@grafana/plugin-e2e: setting the following user preferences", userPreferences);
-      window.grafanaBootData.user = {
-        ...window.grafanaBootData.user,
-        ...userPreferences
-      };
+      Object.assign(window.grafanaBootData.user, userPreferences);
     }
   });
 };

package/dist/matchers/toDisplayPreviews.js

@@ -7,12 +7,20 @@ const toDisplayPreviews = async (variableEditPage, previewTexts, options) => {
   let pass = false;
   let actual;
   let message = `To find preview of values: ${previewTexts.join(", ")}}`;
+  const { Edit } = variableEditPage.ctx.selectors.pages.Dashboard.Settings.Variables;
+  const previewLabels = variableEditPage.getByGrafanaSelector(Edit.General.previewOfValuesOption);
+  const previewTable = variableEditPage.getByGrafanaSelector(Edit.CustomVariable.previewTable);
   try {
-    await test.expect(
-      variableEditPage.getByGrafanaSelector(
-        variableEditPage.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption
-      )
-    ).toContainText(previewTexts, options);
+    await test.expect(previewLabels.or(previewTable).first()).toBeVisible({ timeout: options?.timeout });
+    if (await previewTable.isVisible()) {
+      const headerTexts = await previewTable.locator("thead th").allInnerTexts();
+      const textColumnIndex = headerTexts.findIndex((headerText) => headerText.trim() === "text");
+      const textCellSelector = `tbody tr td:nth-child(${textColumnIndex === -1 ? 3 : textColumnIndex + 1})`;
+      const textCells = previewTable.locator(textCellSelector);
+      await test.expect(textCells).toContainText(previewTexts, options);
+    } else {
+      await test.expect(previewLabels).toContainText(previewTexts, options);
+    }
     return {
       pass: true,
       actual: false,

package/dist/models/pages/AlertRuleEditPage.js

@@ -4,7 +4,6 @@ var version = require('../../utils/version.js');
 var GrafanaPage = require('./GrafanaPage.js');
 var AlertRuleQuery = require('../components/AlertRuleQuery.js');
 var test = require('@playwright/test');
-var isFeatureToggleEnabled = require('../../fixtures/isFeatureToggleEnabled.js');
 
 const QUERY_AND_EXPRESSION_STEP_ID = "2";
 const ALERT_PAGE_READY_TIMEOUT = 15e3;
@@ -37,18 +36,13 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
     );
   }
   async isAdvancedModeSupported() {
-    const alertingQueryAndExpressionsStepMode = await isFeatureToggleEnabled.isLegacyFeatureEnabled(
-      this.ctx.page,
-      "alertingQueryAndExpressionsStepMode"
-    );
-    if (alertingQueryAndExpressionsStepMode) {
-      await test.expect(this.advancedModeSwitch).toBeVisible({ timeout: ALERT_PAGE_READY_TIMEOUT });
-      await test.expect(this.advancedModeSwitch).toHaveCount(1, { timeout: ALERT_PAGE_READY_TIMEOUT });
-      return true;
+    if (version.lt(this.ctx.grafanaVersion, "11.5.0")) {
+      return false;
     }
-    await test.expect(this.advancedModeSwitch).not.toBeVisible({ timeout: ALERT_PAGE_READY_TIMEOUT });
-    await test.expect(this.advancedModeSwitch).toHaveCount(0, { timeout: ALERT_PAGE_READY_TIMEOUT });
-    return false;
+    await this.getByGrafanaSelector(
+      this.ctx.selectors.components.AlertRules.step(QUERY_AND_EXPRESSION_STEP_ID)
+    ).waitFor({ state: "visible", timeout: ALERT_PAGE_READY_TIMEOUT });
+    return await this.advancedModeSwitch.count() > 0;
   }
   /*
    * Enables the advanced mode for the query and expression step.

package/dist/options.js

@@ -7,7 +7,11 @@ const DEFAULT_ADMIN_USER = {
 };
 const DEFAULT_OPEN_FEATURE_FLAGS = {
   // disable the splash screen by default for all consumers of plugin-e2e
-  splashScreen: false
+  splashScreen: false,
+  // keep the variables and annotations tabs on the dashboard settings page.
+  // when this flag is enabled (default since Grafana 13.2.0), the tabs only show
+  // an alert pointing to the dashboard sidebar, which breaks VariableEditPage and AnnotationEditPage
+  "grafana.dashboardSettingsRedesign": false
 };
 const options = {
   userPreferences: [{}, { option: true, scope: "worker" }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [