@grafana/plugin-e2e 2.1.9-canary.2053.17240496040.0 → 2.1.9-canary.2053.17260056832.0

package/dist/index.d.ts

@@ -427,6 +427,7 @@ declare class AlertRuleQuery extends GrafanaPage {
 declare class AlertRuleEditPage extends GrafanaPage {
     readonly ctx: PluginTestCtx;
     readonly args?: AlertRuleArgs | undefined;
+    private fullfilled;
     constructor(ctx: PluginTestCtx, args?: AlertRuleArgs | undefined);
     /**
      * Navigates to the annotation edit page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.
@@ -435,8 +436,8 @@ declare class AlertRuleEditPage extends GrafanaPage {
     /**
      * Returns a locator for hte alert rule name field
      */
-    get alertRuleNameField(): Locator;
-    get advancedModeSwitch(): Locator;
+    get alertRuleNameField(): _playwright_test.Locator;
+    get advancedModeSwitch(): _playwright_test.Locator;
     isAdvancedModeSupported(): Promise<boolean>;
     enableAdvancedQueryMode(): Promise<void>;
     disableAdvancedQueryMode(): Promise<void>;

package/dist/models/pages/AlertRuleEditPage.js

@@ -25,12 +25,16 @@ function _interopNamespaceDefault(e) {
 
 var semver__namespace = /*#__PURE__*/_interopNamespaceDefault(semver);
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "" , value);
 const QUERY_AND_EXPRESSION_STEP_ID = "2";
 class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
   constructor(ctx, args) {
     super(ctx, args);
     this.ctx = ctx;
     this.args = args;
+    __publicField(this, "fullfilled", false);
   }
   /**
    * Navigates to the annotation edit page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.
@@ -147,14 +151,19 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
    */
   async evaluate(options) {
     await this.ctx.page.waitForTimeout(1e3);
+    if (this.fullfilled) {
+      await this.ctx.page.unroute(this.ctx.selectors.apis.Alerting.eval);
+    }
     if (semver__namespace.gte(this.ctx.grafanaVersion, "10.0.0")) {
       this.ctx.page.route(this.ctx.selectors.apis.Alerting.eval, async (route) => {
         const response = await route.fetch();
         if (!response.ok()) {
+          this.fullfilled = true;
           return route.fulfill({ response });
         }
         let body = await response.json();
         const statuses = Object.keys(body.results).map((key) => body.results[key].status);
+        this.fullfilled = true;
         route.fulfill({
           response,
           status: statuses.every((status) => status >= 200 && status < 300) ? 200 : statuses[0]
@@ -165,17 +174,16 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
       (resp) => resp.url().includes(this.ctx.selectors.apis.Alerting.eval),
       options
     );
-    let evaluateButton;
+    let evaluateButton = this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.previewButton);
     if (semver__namespace.lt(this.ctx.grafanaVersion, "11.1.0")) {
-      evaluateButton = await this.ctx.page.getByRole("button", { name: "Preview", exact: true });
-    } else {
-      evaluateButton = await this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.previewButton);
+      evaluateButton = this.ctx.page.getByRole("button", { name: "Preview", exact: true });
     }
     const evalReq = this.ctx.page.waitForRequest((req) => req.url().includes(this.ctx.selectors.apis.Alerting.eval), {
       timeout: 5e3
     }).catch(async () => {
       await evaluateButton.click();
     });
+    await test.expect(evaluateButton).toBeVisible();
     await evaluateButton.click();
     await evalReq;
     return responsePromise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "2.1.9-canary.2053.17240496040.0",
+  "version": "2.1.9-canary.2053.17260056832.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -47,5 +47,5 @@
     "uuid": "^11.0.2",
     "yaml": "^2.3.4"
   },
-  "gitHead": "5f8dce1c79bcc41cd8a0843c37a6d6e1c1932d55"
+  "gitHead": "e37895f0b543c6dafaea7683deceb9dd13afcf9d"
 }