@grafana/plugin-e2e 0.10.3 → 0.11.0-canary.698.057e3a5.0

package/dist/matchers/index.js

@@ -4,12 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const toBeOK_1 = __importDefault(require("./toBeOK"));
-const toHavePanelError_1 = __importDefault(require("./toHavePanelError"));
 const toDisplayPreviews_1 = __importDefault(require("./toDisplayPreviews"));
 const toHaveAlert_1 = __importDefault(require("./toHaveAlert"));
 exports.default = {
     toBeOK: toBeOK_1.default,
-    toHavePanelError: toHavePanelError_1.default,
     toDisplayPreviews: toDisplayPreviews_1.default,
     toHaveAlert: toHaveAlert_1.default,
 };

package/dist/models/ExplorePage.js

@@ -5,13 +5,23 @@ const test_1 = require("@playwright/test");
 const DataSourcePicker_1 = require("./DataSourcePicker");
 const GrafanaPage_1 = require("./GrafanaPage");
 const TimeRange_1 = require("./TimeRange");
+const Panel_1 = require("./Panel");
+const TIME_SERIES_PANEL_SELECTOR_SUFFIX = 'Graph';
+const TABLE_PANEL_SELECTOR_SUFFIX = 'Table';
+const LOGS_PANEL_SELECTOR_SUFFIX = 'Logs';
 class ExplorePage extends GrafanaPage_1.GrafanaPage {
     datasource;
     timeRange;
+    timeSeriesPanel;
+    logsPanel;
+    tablePanel;
     constructor(ctx) {
         super(ctx);
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
         this.timeRange = new TimeRange_1.TimeRange(ctx);
+        this.timeSeriesPanel = new Panel_1.Panel(ctx, this.getByTestIdOrAriaLabel(ctx.selectors.components.Panels.Panel.title(TIME_SERIES_PANEL_SELECTOR_SUFFIX)));
+        this.tablePanel = new Panel_1.Panel(ctx, this.getByTestIdOrAriaLabel(ctx.selectors.components.Panels.Panel.title(TABLE_PANEL_SELECTOR_SUFFIX)));
+        this.logsPanel = new Panel_1.Panel(ctx, this.getByTestIdOrAriaLabel(ctx.selectors.components.Panels.Panel.title(LOGS_PANEL_SELECTOR_SUFFIX)));
     }
     /**
      * Navigates to the explore page.

package/dist/models/GrafanaPage.js

@@ -25,11 +25,12 @@ class GrafanaPage {
      * @param selector the data-testid or aria-label of the element
      * @param root optional root locator to search within. If no locator is provided, the page will be used
      */
-    getByTestIdOrAriaLabel(selector, root) {
+    getByTestIdOrAriaLabel(selector, options) {
+        const startsWith = options?.startsWith ? '^' : '';
         if (selector.startsWith('data-testid')) {
-            return (root || this.ctx.page).getByTestId(selector);
+            return (options?.root || this.ctx.page).locator(`[data-testid${startsWith}="${selector}"]`);
         }
-        return (root || this.ctx.page).locator(`[aria-label="${selector}"]`);
+        return (options?.root || this.ctx.page).locator(`[aria-label${startsWith}="${selector}"]`);
     }
     /**
      * Mocks the response of the datasource query call

package/dist/models/Panel.js

@@ -0,0 +1,52 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Panel = void 0;
+const semver = __importStar(require("semver"));
+const GrafanaPage_1 = require("./GrafanaPage");
+const ERROR_STATUS = 'error';
+class Panel extends GrafanaPage_1.GrafanaPage {
+    ctx;
+    locator;
+    constructor(ctx, locator) {
+        super(ctx);
+        this.ctx = ctx;
+        this.locator = locator;
+    }
+    /**
+     * Returns the locator for the panel error (if any)
+     */
+    getErrorIcon() {
+        let selector = this.ctx.selectors.components.Panels.Panel.status(ERROR_STATUS);
+        // the selector (not the selector value) used to identify a panel error changed in 9.4.3
+        if (semver.lte(this.ctx.grafanaVersion, '9.4.3')) {
+            selector = this.ctx.selectors.components.Panels.Panel.headerCornerInfo(ERROR_STATUS);
+        }
+        return this.getByTestIdOrAriaLabel(selector, {
+            root: this.locator,
+        });
+    }
+}
+exports.Panel = Panel;

package/dist/models/PanelEditPage.js

@@ -1,46 +1,26 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PanelEditPage = void 0;
 const test_1 = require("@playwright/test");
-const semver = __importStar(require("semver"));
 const DataSourcePicker_1 = require("./DataSourcePicker");
 const GrafanaPage_1 = require("./GrafanaPage");
 const TimeRange_1 = require("./TimeRange");
-const ERROR_STATUS = 'error';
+const Panel_1 = require("./Panel");
 class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
     datasource;
     timeRange;
+    panel;
     constructor(ctx, args) {
         super(ctx);
         this.ctx = ctx;
         this.args = args;
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
         this.timeRange = new TimeRange_1.TimeRange(ctx);
+        this.panel = new Panel_1.Panel(ctx, 
+        // only one panel is allowed in the panel edit page, so we don't need to use panel title to locate it
+        this.getByTestIdOrAriaLabel(ctx.selectors.components.Panels.Panel.title(''), { startsWith: true }));
     }
     /**
      * Navigates to the panel edit page. If a dashboard uid was not provided, it's assumed that it's a new dashboard.
@@ -115,16 +95,6 @@ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
         await (0, test_1.expect)(locator).toBeVisible();
         return locator;
     }
-    /**
-     * Returns the locator for the panel error (if any)
-     */
-    getPanelError() {
-        // the selector (not the selector value) used to identify a panel error changed in 9.4.3
-        if (semver.lte(this.ctx.grafanaVersion, '9.4.3')) {
-            return this.getByTestIdOrAriaLabel(this.ctx.selectors.components.Panels.Panel.headerCornerInfo(ERROR_STATUS));
-        }
-        return this.getByTestIdOrAriaLabel(this.ctx.selectors.components.Panels.Panel.status(ERROR_STATUS));
-    }
     /**
      * Clicks the "Refresh" button in the panel editor. Returns the response promise for the data query
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "0.10.3",
+  "version": "0.11.0-canary.698.057e3a5.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -45,5 +45,5 @@
     "semver": "^7.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "5e8b9bdbc00b8ffa883986fc54b4ac87f1657958"
+  "gitHead": "057e3a5850cb1e7016946cb8e4b7091a6b6b8ab5"
 }

package/dist/matchers/toHavePanelError.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const test_1 = require("@playwright/test");
-const utils_1 = require("./utils");
-const toHavePanelError = async (panelError, options) => {
-    let pass = true;
-    let actual;
-    let message = 'A panel error to be displayed';
-    try {
-        const numberOfErrors = await panelError.getPanelError().count();
-        await (0, test_1.expect)(numberOfErrors).toBe(1);
-    }
-    catch (_) {
-        message = (0, utils_1.getMessage)(message, 'No panel error was found on the page');
-        actual = await panelError.getPanelError().count();
-        pass = false;
-    }
-    return {
-        message: () => message,
-        pass,
-        actual,
-    };
-};
-exports.default = toHavePanelError;