@grafana/plugin-e2e 0.0.2-canary.610.88b3096.0 → 0.0.2

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.
Files changed (45) hide show
  1. package/dist/api.d.ts +2 -6
  2. package/dist/api.js +4 -4
  3. package/dist/e2e-selectors/resolver.js +12 -12
  4. package/dist/e2e-selectors/resolver.test.js +17 -19
  5. package/dist/e2e-selectors/types.d.ts +1 -4
  6. package/dist/e2e-selectors/versioned/apis.js +24 -26
  7. package/dist/e2e-selectors/versioned/components.js +78 -83
  8. package/dist/e2e-selectors/versioned/pages.js +40 -47
  9. package/dist/fixtures/annotationEditPage.js +6 -58
  10. package/dist/fixtures/commands/createDataSource.js +28 -102
  11. package/dist/fixtures/commands/createDataSourceConfigPage.js +12 -77
  12. package/dist/fixtures/commands/login.js +10 -80
  13. package/dist/fixtures/commands/readProvision.js +9 -63
  14. package/dist/fixtures/explorePage.js +5 -55
  15. package/dist/fixtures/grafanaVersion.js +7 -59
  16. package/dist/fixtures/index.js +11 -11
  17. package/dist/fixtures/newDashboardPage.js +5 -55
  18. package/dist/fixtures/panelEditPage.js +3 -52
  19. package/dist/fixtures/selectors.js +10 -58
  20. package/dist/fixtures/variableEditPage.js +6 -58
  21. package/dist/matchers/index.d.ts +0 -4
  22. package/dist/matchers/index.js +3 -5
  23. package/dist/matchers/toBeOK.js +20 -65
  24. package/dist/matchers/toDisplayPreviews.js +21 -66
  25. package/dist/matchers/toHavePanelError.js +20 -70
  26. package/dist/matchers/utils.js +1 -1
  27. package/dist/models/AnnotationEditPage.js +13 -77
  28. package/dist/models/AnnotationPage.js +21 -94
  29. package/dist/models/DashboardPage.js +50 -156
  30. package/dist/models/DataSourceConfigPage.d.ts +2 -2
  31. package/dist/models/DataSourceConfigPage.js +25 -131
  32. package/dist/models/DataSourcePicker.js +13 -81
  33. package/dist/models/ExplorePage.d.ts +1 -1
  34. package/dist/models/ExplorePage.js +34 -123
  35. package/dist/models/GrafanaPage.js +33 -137
  36. package/dist/models/PanelEditPage.d.ts +1 -1
  37. package/dist/models/PanelEditPage.js +37 -132
  38. package/dist/models/TimeRange.js +25 -114
  39. package/dist/models/VariableEditPage.js +25 -104
  40. package/dist/models/VariablePage.js +22 -101
  41. package/dist/selectorEngine.js +8 -8
  42. package/dist/types.d.ts +1 -12
  43. package/package.json +2 -2
  44. package/dist/matchers/toHaveAlert.d.ts +0 -8
  45. package/dist/matchers/toHaveAlert.js +0 -75
@@ -1,19 +1,4 @@
1
1
  "use strict";
2
- var __extends = (this && this.__extends) || (function () {
3
- var extendStatics = function (d, b) {
4
- extendStatics = Object.setPrototypeOf ||
5
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
- return extendStatics(d, b);
8
- };
9
- return function (d, b) {
10
- if (typeof b !== "function" && b !== null)
11
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
- extendStatics(d, b);
13
- function __() { this.constructor = d; }
14
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
- };
16
- })();
17
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18
3
  if (k2 === undefined) k2 = k;
19
4
  var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -37,129 +22,49 @@ var __importStar = (this && this.__importStar) || function (mod) {
37
22
  __setModuleDefault(result, mod);
38
23
  return result;
39
24
  };
40
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
41
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
42
- return new (P || (P = Promise))(function (resolve, reject) {
43
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
44
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
45
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
46
- step((generator = generator.apply(thisArg, _arguments || [])).next());
47
- });
48
- };
49
- var __generator = (this && this.__generator) || function (thisArg, body) {
50
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
51
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
52
- function verb(n) { return function (v) { return step([n, v]); }; }
53
- function step(op) {
54
- if (f) throw new TypeError("Generator is already executing.");
55
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
56
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
57
- if (y = 0, t) op = [op[0] & 2, t.value];
58
- switch (op[0]) {
59
- case 0: case 1: t = op; break;
60
- case 4: _.label++; return { value: op[1], done: false };
61
- case 5: _.label++; y = op[1]; op = [0]; continue;
62
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
63
- default:
64
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
65
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
66
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
67
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
68
- if (t[2]) _.ops.pop();
69
- _.trys.pop(); continue;
70
- }
71
- op = body.call(thisArg, _);
72
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
73
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
74
- }
75
- };
76
25
  Object.defineProperty(exports, "__esModule", { value: true });
77
26
  exports.PanelEditPage = void 0;
78
- var test_1 = require("@playwright/test");
79
- var semver = __importStar(require("semver"));
80
- var DataSourcePicker_1 = require("./DataSourcePicker");
81
- var GrafanaPage_1 = require("./GrafanaPage");
82
- var TimeRange_1 = require("./TimeRange");
83
- var ERROR_STATUS = 'error';
84
- var PanelEditPage = (function (_super) {
85
- __extends(PanelEditPage, _super);
86
- function PanelEditPage(ctx) {
87
- var _this = _super.call(this, ctx) || this;
88
- _this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
89
- _this.timeRange = new TimeRange_1.TimeRange(ctx);
90
- return _this;
27
+ const test_1 = require("@playwright/test");
28
+ const semver = __importStar(require("semver"));
29
+ const DataSourcePicker_1 = require("./DataSourcePicker");
30
+ const GrafanaPage_1 = require("./GrafanaPage");
31
+ const TimeRange_1 = require("./TimeRange");
32
+ const ERROR_STATUS = 'error';
33
+ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
34
+ datasource;
35
+ timeRange;
36
+ constructor(ctx) {
37
+ super(ctx);
38
+ this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
39
+ this.timeRange = new TimeRange_1.TimeRange(ctx);
91
40
  }
92
- PanelEditPage.prototype.setVisualization = function (visualization) {
93
- return __awaiter(this, void 0, void 0, function () {
94
- return __generator(this, function (_a) {
95
- switch (_a.label) {
96
- case 0: return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.toggleVizPicker).click()];
97
- case 1:
98
- _a.sent();
99
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PluginVisualization.item(visualization)).click()];
100
- case 2:
101
- _a.sent();
102
- return [4, (0, test_1.expect)(this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.toggleVizPicker), "Could not set visualization to ".concat(visualization, ". Ensure the panel is installed.")).toHaveText(visualization)];
103
- case 3:
104
- _a.sent();
105
- return [2];
106
- }
107
- });
108
- });
109
- };
110
- PanelEditPage.prototype.apply = function () {
111
- return __awaiter(this, void 0, void 0, function () {
112
- return __generator(this, function (_a) {
113
- switch (_a.label) {
114
- case 0: return [4, this.ctx.page.getByTestId(this.ctx.selectors.components.PanelEditor.applyButton).click()];
115
- case 1:
116
- _a.sent();
117
- return [2];
118
- }
119
- });
120
- });
121
- };
122
- PanelEditPage.prototype.getQueryEditorRow = function (refId) {
123
- return __awaiter(this, void 0, void 0, function () {
124
- var locator;
125
- return __generator(this, function (_a) {
126
- switch (_a.label) {
127
- case 0:
128
- locator = this.getByTestIdOrAriaLabel(this.ctx.selectors.components.QueryEditorRows.rows).filter({
129
- has: this.getByTestIdOrAriaLabel(this.ctx.selectors.components.QueryEditorRow.title(refId)),
130
- });
131
- return [4, (0, test_1.expect)(locator).toBeVisible()];
132
- case 1:
133
- _a.sent();
134
- return [2, locator];
135
- }
136
- });
41
+ async setVisualization(visualization) {
42
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.toggleVizPicker).click();
43
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PluginVisualization.item(visualization)).click();
44
+ await (0, test_1.expect)(this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.toggleVizPicker), `Could not set visualization to ${visualization}. Ensure the panel is installed.`).toHaveText(visualization);
45
+ }
46
+ async apply() {
47
+ await this.ctx.page.getByTestId(this.ctx.selectors.components.PanelEditor.applyButton).click();
48
+ }
49
+ async getQueryEditorRow(refId) {
50
+ const locator = this.getByTestIdOrAriaLabel(this.ctx.selectors.components.QueryEditorRows.rows).filter({
51
+ has: this.getByTestIdOrAriaLabel(this.ctx.selectors.components.QueryEditorRow.title(refId)),
137
52
  });
138
- };
139
- PanelEditPage.prototype.getPanelError = function () {
53
+ await (0, test_1.expect)(locator).toBeVisible();
54
+ return locator;
55
+ }
56
+ getPanelError() {
140
57
  if (semver.lte(this.ctx.grafanaVersion, '9.4.3')) {
141
58
  return this.getByTestIdOrAriaLabel(this.ctx.selectors.components.Panels.Panel.headerCornerInfo(ERROR_STATUS));
142
59
  }
143
60
  return this.getByTestIdOrAriaLabel(this.ctx.selectors.components.Panels.Panel.status(ERROR_STATUS));
144
- };
145
- PanelEditPage.prototype.refreshPanel = function (options) {
146
- return __awaiter(this, void 0, void 0, function () {
147
- var responsePromise;
148
- var _this = this;
149
- return __generator(this, function (_a) {
150
- switch (_a.label) {
151
- case 0:
152
- responsePromise = this.ctx.page.waitForResponse(function (resp) { return resp.url().includes(_this.ctx.selectors.apis.DataSource.query); }, options);
153
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.General.content)
154
- .locator("selector=".concat(this.ctx.selectors.components.RefreshPicker.runButtonV2))
155
- .click()];
156
- case 1:
157
- _a.sent();
158
- return [2, responsePromise];
159
- }
160
- });
161
- });
162
- };
163
- return PanelEditPage;
164
- }(GrafanaPage_1.GrafanaPage));
61
+ }
62
+ async refreshPanel(options) {
63
+ const responsePromise = this.ctx.page.waitForResponse((resp) => resp.url().includes(this.ctx.selectors.apis.DataSource.query), options);
64
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.PanelEditor.General.content)
65
+ .locator(`selector=${this.ctx.selectors.components.RefreshPicker.runButtonV2}`)
66
+ .click();
67
+ return responsePromise;
68
+ }
69
+ }
165
70
  exports.PanelEditPage = PanelEditPage;
@@ -1,119 +1,30 @@
1
1
  "use strict";
2
- var __extends = (this && this.__extends) || (function () {
3
- var extendStatics = function (d, b) {
4
- extendStatics = Object.setPrototypeOf ||
5
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
- return extendStatics(d, b);
8
- };
9
- return function (d, b) {
10
- if (typeof b !== "function" && b !== null)
11
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
- extendStatics(d, b);
13
- function __() { this.constructor = d; }
14
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
- };
16
- })();
17
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
19
- return new (P || (P = Promise))(function (resolve, reject) {
20
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
21
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
22
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
23
- step((generator = generator.apply(thisArg, _arguments || [])).next());
24
- });
25
- };
26
- var __generator = (this && this.__generator) || function (thisArg, body) {
27
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
28
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
29
- function verb(n) { return function (v) { return step([n, v]); }; }
30
- function step(op) {
31
- if (f) throw new TypeError("Generator is already executing.");
32
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
33
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
34
- if (y = 0, t) op = [op[0] & 2, t.value];
35
- switch (op[0]) {
36
- case 0: case 1: t = op; break;
37
- case 4: _.label++; return { value: op[1], done: false };
38
- case 5: _.label++; y = op[1]; op = [0]; continue;
39
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
40
- default:
41
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
42
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
43
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
44
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
45
- if (t[2]) _.ops.pop();
46
- _.trys.pop(); continue;
47
- }
48
- op = body.call(thisArg, _);
49
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
50
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
51
- }
52
- };
53
2
  Object.defineProperty(exports, "__esModule", { value: true });
54
3
  exports.TimeRange = void 0;
55
- var GrafanaPage_1 = require("./GrafanaPage");
56
- var TimeRange = (function (_super) {
57
- __extends(TimeRange, _super);
58
- function TimeRange(ctx) {
59
- return _super.call(this, ctx) || this;
4
+ const GrafanaPage_1 = require("./GrafanaPage");
5
+ class TimeRange extends GrafanaPage_1.GrafanaPage {
6
+ constructor(ctx) {
7
+ super(ctx);
8
+ }
9
+ async set({ from, to, zone }) {
10
+ try {
11
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.openButton).click();
12
+ }
13
+ catch (e) {
14
+ await this.ctx.page.locator('[aria-controls="TimePickerContent"]').last().click();
15
+ }
16
+ if (zone) {
17
+ await this.ctx.page.getByRole('button', { name: 'Change time settings' }).click();
18
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimeZonePicker.containerV2).fill(zone);
19
+ }
20
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.absoluteTimeRangeTitle).click();
21
+ const fromField = await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.fromField);
22
+ await fromField.clear();
23
+ await fromField.fill(from);
24
+ const toField = await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.toField);
25
+ await toField.clear();
26
+ await toField.fill(to);
27
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.applyTimeRange).click();
60
28
  }
61
- TimeRange.prototype.set = function (_a) {
62
- var from = _a.from, to = _a.to, zone = _a.zone;
63
- return __awaiter(this, void 0, void 0, function () {
64
- var e_1, fromField, toField;
65
- return __generator(this, function (_b) {
66
- switch (_b.label) {
67
- case 0:
68
- _b.trys.push([0, 2, , 4]);
69
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.openButton).click()];
70
- case 1:
71
- _b.sent();
72
- return [3, 4];
73
- case 2:
74
- e_1 = _b.sent();
75
- return [4, this.ctx.page.locator('[aria-controls="TimePickerContent"]').last().click()];
76
- case 3:
77
- _b.sent();
78
- return [3, 4];
79
- case 4:
80
- if (!zone) return [3, 7];
81
- return [4, this.ctx.page.getByRole('button', { name: 'Change time settings' }).click()];
82
- case 5:
83
- _b.sent();
84
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimeZonePicker.containerV2).fill(zone)];
85
- case 6:
86
- _b.sent();
87
- _b.label = 7;
88
- case 7: return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.absoluteTimeRangeTitle).click()];
89
- case 8:
90
- _b.sent();
91
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.fromField)];
92
- case 9:
93
- fromField = _b.sent();
94
- return [4, fromField.clear()];
95
- case 10:
96
- _b.sent();
97
- return [4, fromField.fill(from)];
98
- case 11:
99
- _b.sent();
100
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.toField)];
101
- case 12:
102
- toField = _b.sent();
103
- return [4, toField.clear()];
104
- case 13:
105
- _b.sent();
106
- return [4, toField.fill(to)];
107
- case 14:
108
- _b.sent();
109
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.components.TimePicker.applyTimeRange).click()];
110
- case 15:
111
- _b.sent();
112
- return [2];
113
- }
114
- });
115
- });
116
- };
117
- return TimeRange;
118
- }(GrafanaPage_1.GrafanaPage));
29
+ }
119
30
  exports.TimeRange = TimeRange;
@@ -1,109 +1,30 @@
1
1
  "use strict";
2
- var __extends = (this && this.__extends) || (function () {
3
- var extendStatics = function (d, b) {
4
- extendStatics = Object.setPrototypeOf ||
5
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
- return extendStatics(d, b);
8
- };
9
- return function (d, b) {
10
- if (typeof b !== "function" && b !== null)
11
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
- extendStatics(d, b);
13
- function __() { this.constructor = d; }
14
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
- };
16
- })();
17
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
19
- return new (P || (P = Promise))(function (resolve, reject) {
20
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
21
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
22
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
23
- step((generator = generator.apply(thisArg, _arguments || [])).next());
24
- });
25
- };
26
- var __generator = (this && this.__generator) || function (thisArg, body) {
27
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
28
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
29
- function verb(n) { return function (v) { return step([n, v]); }; }
30
- function step(op) {
31
- if (f) throw new TypeError("Generator is already executing.");
32
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
33
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
34
- if (y = 0, t) op = [op[0] & 2, t.value];
35
- switch (op[0]) {
36
- case 0: case 1: t = op; break;
37
- case 4: _.label++; return { value: op[1], done: false };
38
- case 5: _.label++; y = op[1]; op = [0]; continue;
39
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
40
- default:
41
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
42
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
43
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
44
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
45
- if (t[2]) _.ops.pop();
46
- _.trys.pop(); continue;
47
- }
48
- op = body.call(thisArg, _);
49
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
50
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
51
- }
52
- };
53
2
  Object.defineProperty(exports, "__esModule", { value: true });
54
3
  exports.VariableEditPage = void 0;
55
- var gte = require('semver/functions/gte');
56
- var DataSourcePicker_1 = require("./DataSourcePicker");
57
- var GrafanaPage_1 = require("./GrafanaPage");
58
- var VariableEditPage = (function (_super) {
59
- __extends(VariableEditPage, _super);
60
- function VariableEditPage(ctx) {
61
- var _this = _super.call(this, ctx) || this;
62
- _this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
63
- return _this;
4
+ const gte = require('semver/functions/gte');
5
+ const DataSourcePicker_1 = require("./DataSourcePicker");
6
+ const GrafanaPage_1 = require("./GrafanaPage");
7
+ class VariableEditPage extends GrafanaPage_1.GrafanaPage {
8
+ datasource;
9
+ constructor(ctx) {
10
+ super(ctx);
11
+ this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
12
+ }
13
+ async setVariableType(type) {
14
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2)
15
+ .locator('input')
16
+ .fill(type);
17
+ await this.ctx.page.keyboard.press('ArrowDown');
18
+ await this.ctx.page.keyboard.press('Enter');
19
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2).scrollIntoViewIfNeeded();
20
+ }
21
+ async runQuery() {
22
+ if (gte(this.ctx.grafanaVersion, '9.2.0')) {
23
+ await this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton).click();
24
+ }
25
+ else {
26
+ await this.ctx.page.keyboard.press('Tab');
27
+ }
64
28
  }
65
- VariableEditPage.prototype.setVariableType = function (type) {
66
- return __awaiter(this, void 0, void 0, function () {
67
- return __generator(this, function (_a) {
68
- switch (_a.label) {
69
- case 0: return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2)
70
- .locator('input')
71
- .fill(type)];
72
- case 1:
73
- _a.sent();
74
- return [4, this.ctx.page.keyboard.press('ArrowDown')];
75
- case 2:
76
- _a.sent();
77
- return [4, this.ctx.page.keyboard.press('Enter')];
78
- case 3:
79
- _a.sent();
80
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2).scrollIntoViewIfNeeded()];
81
- case 4:
82
- _a.sent();
83
- return [2];
84
- }
85
- });
86
- });
87
- };
88
- VariableEditPage.prototype.runQuery = function () {
89
- return __awaiter(this, void 0, void 0, function () {
90
- return __generator(this, function (_a) {
91
- switch (_a.label) {
92
- case 0:
93
- if (!gte(this.ctx.grafanaVersion, '9.2.0')) return [3, 2];
94
- return [4, this.getByTestIdOrAriaLabel(this.ctx.selectors.pages.Dashboard.Settings.Variables.Edit.General.submitButton).click()];
95
- case 1:
96
- _a.sent();
97
- return [3, 4];
98
- case 2: return [4, this.ctx.page.keyboard.press('Tab')];
99
- case 3:
100
- _a.sent();
101
- _a.label = 4;
102
- case 4: return [2];
103
- }
104
- });
105
- });
106
- };
107
- return VariableEditPage;
108
- }(GrafanaPage_1.GrafanaPage));
29
+ }
109
30
  exports.VariableEditPage = VariableEditPage;
@@ -1,107 +1,28 @@
1
1
  "use strict";
2
- var __extends = (this && this.__extends) || (function () {
3
- var extendStatics = function (d, b) {
4
- extendStatics = Object.setPrototypeOf ||
5
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
- return extendStatics(d, b);
8
- };
9
- return function (d, b) {
10
- if (typeof b !== "function" && b !== null)
11
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
- extendStatics(d, b);
13
- function __() { this.constructor = d; }
14
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
- };
16
- })();
17
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
19
- return new (P || (P = Promise))(function (resolve, reject) {
20
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
21
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
22
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
23
- step((generator = generator.apply(thisArg, _arguments || [])).next());
24
- });
25
- };
26
- var __generator = (this && this.__generator) || function (thisArg, body) {
27
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
28
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
29
- function verb(n) { return function (v) { return step([n, v]); }; }
30
- function step(op) {
31
- if (f) throw new TypeError("Generator is already executing.");
32
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
33
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
34
- if (y = 0, t) op = [op[0] & 2, t.value];
35
- switch (op[0]) {
36
- case 0: case 1: t = op; break;
37
- case 4: _.label++; return { value: op[1], done: false };
38
- case 5: _.label++; y = op[1]; op = [0]; continue;
39
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
40
- default:
41
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
42
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
43
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
44
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
45
- if (t[2]) _.ops.pop();
46
- _.trys.pop(); continue;
47
- }
48
- op = body.call(thisArg, _);
49
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
50
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
51
- }
52
- };
53
2
  Object.defineProperty(exports, "__esModule", { value: true });
54
3
  exports.VariablePage = void 0;
55
- var GrafanaPage_1 = require("./GrafanaPage");
56
- var VariableEditPage_1 = require("./VariableEditPage");
57
- var VariablePage = (function (_super) {
58
- __extends(VariablePage, _super);
59
- function VariablePage(ctx) {
60
- return _super.call(this, ctx) || this;
4
+ const GrafanaPage_1 = require("./GrafanaPage");
5
+ const VariableEditPage_1 = require("./VariableEditPage");
6
+ class VariablePage extends GrafanaPage_1.GrafanaPage {
7
+ constructor(ctx) {
8
+ super(ctx);
61
9
  }
62
- VariablePage.prototype.goto = function () {
63
- return __awaiter(this, void 0, void 0, function () {
64
- return __generator(this, function (_a) {
65
- switch (_a.label) {
66
- case 0: return [4, this.ctx.page.goto(this.ctx.selectors.pages.AddDashboard.Settings.Variables.url, {
67
- waitUntil: 'networkidle',
68
- })];
69
- case 1:
70
- _a.sent();
71
- return [2];
72
- }
73
- });
74
- });
75
- };
76
- VariablePage.prototype.clickAddNew = function () {
77
- return __awaiter(this, void 0, void 0, function () {
78
- var _a, addVariableCTAV2, addVariableCTAV2Item, newButton, ctaSelector, error_1;
79
- return __generator(this, function (_b) {
80
- switch (_b.label) {
81
- case 0:
82
- _a = this.ctx.selectors.pages.Dashboard.Settings.Variables.List, addVariableCTAV2 = _a.addVariableCTAV2, addVariableCTAV2Item = _a.addVariableCTAV2Item, newButton = _a.newButton;
83
- _b.label = 1;
84
- case 1:
85
- _b.trys.push([1, 4, , 6]);
86
- ctaSelector = this.getByTestIdOrAriaLabel(addVariableCTAV2(addVariableCTAV2Item));
87
- return [4, ctaSelector.waitFor()];
88
- case 2:
89
- _b.sent();
90
- return [4, ctaSelector.click()];
91
- case 3:
92
- _b.sent();
93
- return [3, 6];
94
- case 4:
95
- error_1 = _b.sent();
96
- return [4, this.getByTestIdOrAriaLabel(newButton).click()];
97
- case 5:
98
- _b.sent();
99
- return [3, 6];
100
- case 6: return [2, new VariableEditPage_1.VariableEditPage(this.ctx)];
101
- }
102
- });
10
+ async goto() {
11
+ await this.ctx.page.goto(this.ctx.selectors.pages.AddDashboard.Settings.Variables.url, {
12
+ waitUntil: 'networkidle',
103
13
  });
104
- };
105
- return VariablePage;
106
- }(GrafanaPage_1.GrafanaPage));
14
+ }
15
+ async clickAddNew() {
16
+ const { addVariableCTAV2, addVariableCTAV2Item, newButton } = this.ctx.selectors.pages.Dashboard.Settings.Variables.List;
17
+ try {
18
+ const ctaSelector = this.getByTestIdOrAriaLabel(addVariableCTAV2(addVariableCTAV2Item));
19
+ await ctaSelector.waitFor();
20
+ await ctaSelector.click();
21
+ }
22
+ catch (error) {
23
+ await this.getByTestIdOrAriaLabel(newButton).click();
24
+ }
25
+ return new VariableEditPage_1.VariableEditPage(this.ctx);
26
+ }
27
+ }
107
28
  exports.VariablePage = VariablePage;
@@ -1,18 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.grafanaE2ESelectorEngine = void 0;
4
- var grafanaE2ESelectorEngine = function () { return ({
5
- query: function (root, selector) {
4
+ const grafanaE2ESelectorEngine = () => ({
5
+ query(root, selector) {
6
6
  if (selector.startsWith('data-testid')) {
7
- return root.querySelector("[data-testid=\"".concat(selector, "\"]"));
7
+ return root.querySelector(`[data-testid="${selector}"]`);
8
8
  }
9
- return root.querySelector("[aria-label=\"".concat(selector, "\"]"));
9
+ return root.querySelector(`[aria-label="${selector}"]`);
10
10
  },
11
- queryAll: function (root, selector) {
11
+ queryAll(root, selector) {
12
12
  if (selector.startsWith('data-testid')) {
13
- return root.querySelectorAll("[data-testid=\"".concat(selector, "\"]"));
13
+ return root.querySelectorAll(`[data-testid="${selector}"]`);
14
14
  }
15
- return root.querySelectorAll("[aria-label=\"".concat(selector, "\"]"));
15
+ return root.querySelectorAll(`[aria-label="${selector}"]`);
16
16
  },
17
- }); };
17
+ });
18
18
  exports.grafanaE2ESelectorEngine = grafanaE2ESelectorEngine;
package/dist/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Locator, PlaywrightTestArgs } from '@playwright/test';
1
+ import { PlaywrightTestArgs } from '@playwright/test';
2
2
  import { E2ESelectors } from './e2e-selectors/types';
3
3
  export type PluginTestCtx = {
4
4
  grafanaVersion: string;
@@ -51,15 +51,4 @@ export type NavigateOptions = {
51
51
  waitUntil?: 'load' | 'domcontentloaded' | 'networkidle' | 'commit';
52
52
  queryParams?: URLSearchParams;
53
53
  };
54
- export type TriggerQueryOptions = {
55
- skipWaitForResponse: boolean;
56
- };
57
54
  export type Visualization = 'Alert list' | 'Bar gauge' | 'Clock' | 'Dashboard list' | 'Gauge' | 'Graph' | 'Heatmap' | 'Logs' | 'News' | 'Pie Chart' | 'Plugin list' | 'Polystat' | 'Stat' | 'Table' | 'Text' | 'Time series' | 'Worldmap Panel';
58
- export type AlertVariant = 'success' | 'warning' | 'error' | 'info';
59
- export interface AlertPageOptions {
60
- timeout?: number;
61
- has?: Locator;
62
- hasNot?: Locator;
63
- hasNotText?: string | RegExp;
64
- hasText?: string | RegExp;
65
- }