@grafana/plugin-e2e 2.1.9-canary.2051.17212472766.0 → 2.1.9-canary.2051.17213322732.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -146,27 +146,23 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
|
|
|
146
146
|
* Only supported for Grafana version 9.5.0 ad later.
|
|
147
147
|
*/
|
|
148
148
|
async evaluate(options) {
|
|
149
|
-
await this.ctx.page.waitForTimeout(
|
|
149
|
+
await this.ctx.page.waitForTimeout(5e3);
|
|
150
150
|
if (semver__namespace.gte(this.ctx.grafanaVersion, "10.0.0")) {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
});
|
|
167
|
-
},
|
|
168
|
-
{ times: 1 }
|
|
169
|
-
);
|
|
151
|
+
this.ctx.page.route(this.ctx.selectors.apis.Alerting.eval, async (route) => {
|
|
152
|
+
const response = await route.fetch();
|
|
153
|
+
if (!response.ok()) {
|
|
154
|
+
console.log("response not ok for", this.ctx.selectors.apis.Alerting.eval);
|
|
155
|
+
return route.fulfill({ response });
|
|
156
|
+
}
|
|
157
|
+
let body = await response.json();
|
|
158
|
+
const statuses = Object.keys(body.results).map((key) => body.results[key].status);
|
|
159
|
+
console.log("response statuses for", this.ctx.selectors.apis.Alerting.eval);
|
|
160
|
+
console.log("statuses", statuses);
|
|
161
|
+
route.fulfill({
|
|
162
|
+
response,
|
|
163
|
+
status: statuses.every((status) => status >= 200 && status < 300) ? 200 : statuses[0]
|
|
164
|
+
});
|
|
165
|
+
});
|
|
170
166
|
}
|
|
171
167
|
const responsePromise = this.ctx.page.waitForResponse(
|
|
172
168
|
(resp) => resp.url().includes(this.ctx.selectors.apis.Alerting.eval),
|
|
@@ -177,7 +173,7 @@ class AlertRuleEditPage extends GrafanaPage.GrafanaPage {
|
|
|
177
173
|
evaluateButton = this.ctx.page.getByRole("button", { name: "Preview", exact: true });
|
|
178
174
|
}
|
|
179
175
|
const evalReq = this.ctx.page.waitForRequest((req) => req.url().includes(this.ctx.selectors.apis.Alerting.eval), {
|
|
180
|
-
timeout:
|
|
176
|
+
timeout: 1e4
|
|
181
177
|
}).catch(async () => {
|
|
182
178
|
await evaluateButton.click();
|
|
183
179
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@grafana/plugin-e2e",
|
|
3
|
-
"version": "2.1.9-canary.2051.
|
|
3
|
+
"version": "2.1.9-canary.2051.17213322732.0",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"uuid": "^11.0.2",
|
|
48
48
|
"yaml": "^2.3.4"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "e7ef32428c4fb5e52767853bdc586e08c45a2e54"
|
|
51
51
|
}
|