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

package/dist/index.d.ts

@@ -435,8 +435,8 @@ declare class AlertRuleEditPage extends GrafanaPage {
     /**
      * Returns a locator for hte alert rule name field
      */
-    get alertRuleNameField(): _playwright_test.Locator;
-    get advancedModeSwitch(): _playwright_test.Locator;
+    get alertRuleNameField(): Locator;
+    get advancedModeSwitch(): Locator;
     isAdvancedModeSupported(): Promise<boolean>;
     enableAdvancedQueryMode(): Promise<void>;
     disableAdvancedQueryMode(): Promise<void>;

package/dist/models/pages/AlertRuleEditPage.js

@@ -148,19 +148,15 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
   async evaluate(options) {
     await this.ctx.page.waitForTimeout(1e3);
     if (semver__namespace.gte(this.ctx.grafanaVersion, "10.0.0")) {
-      await this.ctx.page.unroute(this.ctx.selectors.apis.Alerting.eval);
-      await this.ctx.page.route(this.ctx.selectors.apis.Alerting.eval, async (route) => {
-        const response2 = await route.fetch();
-        if (!response2.ok()) {
-          console.log("response not ok for", this.ctx.selectors.apis.Alerting.eval);
-          return route.fulfill({ response: response2 });
+      this.ctx.page.route(this.ctx.selectors.apis.Alerting.eval, async (route) => {
+        const response = await route.fetch();
+        if (!response.ok()) {
+          return route.fulfill({ response });
         }
-        let body = await response2.json();
+        let body = await response.json();
         const statuses = Object.keys(body.results).map((key) => body.results[key].status);
-        console.log("response statuses for", this.ctx.selectors.apis.Alerting.eval);
-        console.log("statuses", statuses);
         route.fulfill({
-          response: response2,
+          response,
           status: statuses.every((status) => status >= 200 && status < 300) ? 200 : statuses[0]
         });
       });
@@ -169,9 +165,11 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
       (resp) => resp.url().includes(this.ctx.selectors.apis.Alerting.eval),
       options
     );
-    let evaluateButton = this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.previewButton);
+    let evaluateButton;
     if (semver__namespace.lt(this.ctx.grafanaVersion, "11.1.0")) {
-      evaluateButton = this.ctx.page.getByRole("button", { name: "Preview", exact: true });
+      evaluateButton = await this.ctx.page.getByRole("button", { name: "Preview", exact: true });
+    } else {
+      evaluateButton = await this.getByGrafanaSelector(this.ctx.selectors.components.AlertRules.previewButton);
     }
     const evalReq = this.ctx.page.waitForRequest((req) => req.url().includes(this.ctx.selectors.apis.Alerting.eval), {
       timeout: 5e3
@@ -180,9 +178,7 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
     });
     await evaluateButton.click();
     await evalReq;
-    const response = await responsePromise;
-    await this.ctx.page.unroute(this.ctx.selectors.apis.Alerting.eval);
-    return response;
+    return responsePromise;
   }
 }
 

package/package.json

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