@grafana/plugin-e2e 3.5.0 → 3.5.1-canary.2579.24510474417.0

package/dist/fixtures/openFeature.js

@@ -3,6 +3,9 @@
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function isTeardownError(error) {
+  return error instanceof Error && (error.message.includes("Target page, context or browser has been closed") || error.message.includes("Fetch response has been disposed"));
+}
 async function handleBulkEvaluationRoute(route, flags, latency) {
   let response;
   try {
@@ -39,15 +42,21 @@ async function handleBulkEvaluationRoute(route, flags, latency) {
       headers: { "content-type": "application/json" }
     });
   } catch (error) {
+    if (isTeardownError(error)) {
+      return;
+    }
     console.error("@grafana/plugin-e2e: Failed to intercept OFREP bulk evaluation", error);
-    if (response) {
-      await route.fulfill({ response });
-    } else {
-      await route.fulfill({
-        status: 500,
-        body: JSON.stringify({ error: "Failed to intercept OFREP request" }),
-        headers: { "content-type": "application/json" }
-      });
+    try {
+      if (response) {
+        await route.fulfill({ response });
+      } else {
+        await route.fulfill({
+          status: 500,
+          body: JSON.stringify({ error: "Failed to intercept OFREP request" }),
+          headers: { "content-type": "application/json" }
+        });
+      }
+    } catch {
     }
   }
 }
@@ -74,12 +83,18 @@ async function handleSingleFlagRoute(route, flags, latency) {
     const response = await route.fetch();
     await route.fulfill({ response });
   } catch (error) {
+    if (isTeardownError(error)) {
+      return;
+    }
     console.error("@grafana/plugin-e2e: Failed to intercept OFREP single flag evaluation", error);
-    await route.fulfill({
-      status: 500,
-      body: JSON.stringify({ error: "Failed to intercept OFREP request" }),
-      headers: { "content-type": "application/json" }
-    });
+    try {
+      await route.fulfill({
+        status: 500,
+        body: JSON.stringify({ error: "Failed to intercept OFREP request" }),
+        headers: { "content-type": "application/json" }
+      });
+    } catch {
+    }
   }
 }
 async function setupOpenFeatureRoutes(page, openFeature, latency, selectors) {

package/dist/index.d.ts

@@ -264,8 +264,7 @@ declare class PanelEditOptionsGroup {
     getMultiSelect(label: string): MultiSelect;
     getColorPicker(label: string): ColorPicker;
     getUnitPicker(label: string): UnitPicker;
-    private getByLabel;
-    private getByTestId;
+    private getFieldLocator;
     private getOptionsGroupToggle;
 }
 

package/dist/matchers/toHaveSelected.js

@@ -35,13 +35,16 @@ async function expectSelectToBe(select, value, options) {
   let actual = "";
   try {
     actual = await select.locator(select.ctx.selectors.constants.Select.singleValueContainer("")).innerText(options);
-    test.expect(actual).toMatch(value);
-    return {
-      pass: true,
-      actual,
-      expected: value,
-      message: () => `Value successfully selected`
-    };
+    try {
+      test.expect(actual).toMatch(value);
+      return { pass: true, actual, expected: value, message: () => `Value successfully selected` };
+    } catch {
+      if (typeof value === "string" && value.endsWith("/" + actual.trim())) {
+        return { pass: true, actual, expected: value, message: () => `Value successfully selected` };
+      }
+      throw new Error(`Expected: ${value}
+Received: ${actual}`);
+    }
   } catch (err) {
     return {
       message: () => utils.getMessage(value.toString(), err instanceof Error ? err.toString() : "Unknown error"),

package/dist/models/components/PanelEditOptionsGroup.js

@@ -34,67 +34,43 @@ class PanelEditOptionsGroup {
     await this.getOptionsGroupToggle().click();
   }
   getRadioGroup(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new RadioGroup.RadioGroup(this.ctx, this.getByTestId(label).getByRole("radiogroup"));
-    }
     if (semver.gte(this.ctx.grafanaVersion, "10.2.0")) {
-      return new RadioGroup.RadioGroup(this.ctx, this.getByLabel(label).getByRole("radiogroup"));
+      return new RadioGroup.RadioGroup(this.ctx, this.getFieldLocator(label).getByRole("radiogroup"));
     }
-    return new RadioGroup.RadioGroup(this.ctx, this.getByLabel(label));
+    return new RadioGroup.RadioGroup(this.ctx, this.getFieldLocator(label));
   }
   getSwitch(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new Switch.Switch(this.ctx, this.getByTestId(label));
-    }
-    return new Switch.Switch(this.ctx, this.getByLabel(label));
+    return new Switch.Switch(this.ctx, this.getFieldLocator(label));
   }
   getTextInput(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return this.getByTestId(label).getByRole("textbox");
-    }
-    return this.getByLabel(label).getByRole("textbox");
+    return this.getFieldLocator(label).getByRole("textbox");
   }
   getNumberInput(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return this.getByTestId(label).getByRole("spinbutton");
-    }
-    return this.getByLabel(label).getByRole("spinbutton");
+    return this.getFieldLocator(label).getByRole("spinbutton");
   }
   getSliderInput(label) {
     if (semver.gte(this.ctx.grafanaVersion, "9.1.0")) {
       return this.getNumberInput(label);
     }
-    return this.getByLabel(label).getByRole("textbox");
+    return this.getFieldLocator(label).getByRole("textbox");
   }
   getSelect(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new Select.Select(this.ctx, this.getByTestId(label));
-    }
-    return new Select.Select(this.ctx, this.getByLabel(label));
+    return new Select.Select(this.ctx, this.getFieldLocator(label));
   }
   getMultiSelect(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new MultiSelect.MultiSelect(this.ctx, this.getByTestId(label));
-    }
-    return new MultiSelect.MultiSelect(this.ctx, this.getByLabel(label));
+    return new MultiSelect.MultiSelect(this.ctx, this.getFieldLocator(label));
   }
   getColorPicker(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new ColorPicker.ColorPicker(this.ctx, this.getByTestId(label));
-    }
-    return new ColorPicker.ColorPicker(this.ctx, this.getByLabel(label));
+    return new ColorPicker.ColorPicker(this.ctx, this.getFieldLocator(label));
   }
   getUnitPicker(label) {
-    if (semver.gte(this.ctx.grafanaVersion, "13.0.0-24085625829")) {
-      return new UnitPicker.UnitPicker(this.ctx, this.getByTestId(label));
-    }
-    return new UnitPicker.UnitPicker(this.ctx, this.getByLabel(label));
-  }
-  getByLabel(optionLabel) {
-    return this.element.getByLabel(`${this.groupLabel} ${optionLabel} field property editor`);
+    return new UnitPicker.UnitPicker(this.ctx, this.getFieldLocator(label));
   }
-  getByTestId(optionLabel) {
-    return this.element.getByTestId(`data-testid ${this.groupLabel} ${optionLabel} field property editor`);
+  getFieldLocator(optionLabel) {
+    const selector = utils.resolveGrafanaSelector(
+      this.ctx.selectors.components.PanelEditor.OptionsPane.fieldLabel(`${this.groupLabel} ${optionLabel}`)
+    );
+    return this.element.locator(selector);
   }
   getOptionsGroupToggle() {
     const selector = utils.resolveGrafanaSelector(this.ctx.selectors.components.OptionsGroup.toggle(this.groupLabel));

package/dist/models/components/Select.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var ComponentBase = require('./ComponentBase.js');
-var semver = require('semver');
 var utils = require('../utils.js');
 
 class Select extends ComponentBase.ComponentBase {
@@ -10,6 +9,7 @@ class Select extends ComponentBase.ComponentBase {
   }
   async selectOption(values, options) {
     const menu = await openSelect(this, options);
+    await this.locator().page().keyboard.type(values);
     return selectByValueOrLabel(values, menu, this.ctx, options);
   }
 }
@@ -19,8 +19,12 @@ async function openSelect(component, options) {
   await element.getByRole("combobox").click(options);
   return element.page().locator(utils.resolveGrafanaSelector(selectors.components.Select.menu));
 }
-async function selectByValueOrLabel(labelOrValue, menu, ctx, options) {
-  const option = getOption(menu, ctx).getByText(labelOrValue, { exact: true });
+async function selectByValueOrLabel(labelOrValue, menu, _ctx, options) {
+  const allOptions = getOption(menu);
+  let option = allOptions.getByText(labelOrValue, { exact: true });
+  if (!await option.count()) {
+    option = allOptions.first();
+  }
   const value = await option.textContent(options);
   await option.click(options);
   if (!value) {
@@ -28,11 +32,8 @@ async function selectByValueOrLabel(labelOrValue, menu, ctx, options) {
   }
   return value;
 }
-function getOption(menu, ctx) {
-  if (semver.gte(ctx.grafanaVersion, "11.0.0")) {
-    return menu.getByRole("option");
-  }
-  return menu.getByLabel("Select option");
+function getOption(menu) {
+  return menu.getByRole("option").or(menu.getByLabel("Select option"));
 }
 
 exports.Select = Select;

package/dist/models/pages/DashboardPage.js

@@ -120,7 +120,8 @@ class DashboardPage extends GrafanaPage.GrafanaPage {
         await this.getByGrafanaSelector(pages.Dashboard.Sidebar.addButton).click();
       }
       await this.getByGrafanaSelector(components.Sidebar.newPanelButton).click();
-      await this.getByGrafanaSelector(components.Sidebar.configurePanelButton).click();
+      const configureButton = semver__namespace.eq(this.ctx.grafanaVersion, "13.0.0") ? this.getByGrafanaSelector(components.Sidebar.container).getByRole("button", { name: "Configure" }) : this.getByGrafanaSelector(components.Sidebar.configurePanelButton);
+      await configureButton.click();
     } else if (semver__namespace.gte(this.ctx.grafanaVersion, "9.5.0")) {
       let addButton = this.getByGrafanaSelector(
         components.PageToolbar.itemButton(constants.PageToolBar.itemButtonTitle)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "3.5.0",
+  "version": "3.5.1-canary.2579.24510474417.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -49,10 +49,10 @@
     "dotenv": "^17.2.4"
   },
   "dependencies": {
-    "@grafana/e2e-selectors": "13.1.0-24335230309",
+    "@grafana/e2e-selectors": "13.1.0-24448182242",
     "semver": "^7.5.4",
     "uuid": "^13.0.0",
     "yaml": "^2.3.4"
   },
-  "gitHead": "0b567b0d9f94a1fbb68a3d978481b450cc4206d9"
+  "gitHead": "6cf0d74fb3e59261337819e89a8b33959bd1e54d"
 }