@grafana/plugin-e2e 1.7.2 → 1.7.3-canary.1123.1a0c5f5.0

package/dist/fixtures/selectors.d.ts

@@ -1,6 +1,6 @@
 import { TestFixture } from '@playwright/test';
 import { PlaywrightArgs } from '../types';
-import { E2ESelectors } from '../e2e-selectors';
-type SelectorFixture = TestFixture<E2ESelectors, PlaywrightArgs>;
+import { E2ESelectorGroup } from '@grafana/e2e-selectors';
+type SelectorFixture = TestFixture<E2ESelectorGroup, PlaywrightArgs>;
 export declare const selectors: SelectorFixture;
 export {};

package/dist/fixtures/selectors.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectors = void 0;
-const e2e_selectors_1 = require("../e2e-selectors");
-const versioned_1 = require("../e2e-selectors/versioned");
-const apis_1 = require("../e2e-selectors/versioned/apis");
+const e2e_selectors_1 = require("@grafana/e2e-selectors");
 const selectors = async ({ grafanaVersion }, use) => {
-    const selectors = (0, e2e_selectors_1.resolveSelectors)({
-        components: versioned_1.versionedComponents,
-        pages: versioned_1.versionedPages,
-        apis: apis_1.versionedAPIs,
-    }, grafanaVersion);
+    const selectors = (0, e2e_selectors_1.resolveSelectors)(grafanaVersion);
     await use(selectors);
 };
 exports.selectors = selectors;

package/dist/models/pages/AnnotationPage.js

@@ -49,15 +49,9 @@ class AnnotationPage extends GrafanaPage_1.GrafanaPage {
      * Clicks the add new annotation button and returns the annotation edit page
      */
     async clickAddNew() {
-        const { addAnnotationCTAV2, addAnnotationCTA } = this.ctx.selectors.pages.Dashboard.Settings.Annotations.List;
+        const { addAnnotationCTAV2 } = this.ctx.selectors.pages.Dashboard.Settings.Annotations.List;
         if (!this.dashboard?.uid) {
-            //the dashboard doesn't have any annotations yet (except for the built-in one)
-            if (semver.gte(this.ctx.grafanaVersion, '8.3.0')) {
-                await this.getByGrafanaSelector(addAnnotationCTAV2).click();
-            }
-            else {
-                await this.getByGrafanaSelector(addAnnotationCTA).click();
-            }
+            await this.getByGrafanaSelector(addAnnotationCTAV2).click();
         }
         else {
             //the dashboard already has annotations

package/dist/models/pages/DashboardPage.js

@@ -97,9 +97,10 @@ class DashboardPage extends GrafanaPage_1.GrafanaPage {
      * Clicks the buttons to add a new panel and returns the panel edit page for the new panel
      */
     async addPanel() {
-        const { components, pages } = this.ctx.selectors;
+        const { pages, components } = this.ctx.selectors;
         if (semver.gte(this.ctx.grafanaVersion, '10.0.0')) {
-            await this.getByGrafanaSelector(components.PageToolbar.itemButton(components.PageToolbar.itemButtonTitle)).click();
+            const itemButtonTitle = semver.gte(this.ctx.grafanaVersion, '10.1.0') ? 'Add button' : 'Add panel button';
+            await this.getByGrafanaSelector(components.PageToolbar.itemButton(itemButtonTitle)).click();
             await this.getByGrafanaSelector(pages.AddDashboard.itemButton(pages.AddDashboard.itemButtonAddViz)).click();
         }
         else {

package/dist/models/pages/ExplorePage.js

@@ -86,7 +86,8 @@ class ExplorePage extends GrafanaPage_1.GrafanaPage {
         }
         catch (_) {
             // handle the case when the run button is hidden behind the "Show more items" button
-            await this.getByGrafanaSelector(components.PageToolbar.item(components.PageToolbar.showMoreItems)).click();
+            const toolbarText = 'Show more items';
+            await this.getByGrafanaSelector(components.PageToolbar.item(toolbarText)).click();
             await this.getByGrafanaSelector(components.RefreshPicker.runButtonV2).last().click();
         }
         return responsePromise;

package/dist/models/pages/PanelEditPage.js

@@ -70,7 +70,7 @@ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     }
     async toggleTableView() {
         await (0, utils_1.radioButtonSetChecked)(this.ctx.page, 'Table view', true);
-        let locator = this.getByGrafanaSelector(this.ctx.selectors.components.Panels.Panel.toggleTableViewPanel(''));
+        let locator = this.getByGrafanaSelector(this.ctx.selectors.components.Panels.Panel.title(''));
         if (semver.lt(this.ctx.grafanaVersion, '10.4.0')) {
             locator = this.ctx.page.getByRole('table');
         }
@@ -86,10 +86,11 @@ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     async setPanelTitle(titleText) {
         const TITLE = 'Title';
         const { OptionsGroup, PanelEditor } = this.ctx.selectors.components;
-        await this.collapseSection(OptionsGroup.groupTitle);
+        const sectionGroupTitle = 'Panel options';
+        await this.collapseSection(sectionGroupTitle);
         const vizInput = semver.gte(this.ctx.grafanaVersion, '11.0.0')
             ? this.getByGrafanaSelector(PanelEditor.OptionsPane.fieldInput(TITLE))
-            : this.getByGrafanaSelector(OptionsGroup.group(OptionsGroup.groupTitle)).locator('input').first();
+            : this.getByGrafanaSelector(OptionsGroup.group(sectionGroupTitle)).locator('input').first();
         await vizInput.fill(titleText);
         await this.ctx.page.keyboard.press('Tab');
     }

package/dist/models/pages/VariablePage.js

@@ -25,9 +25,9 @@ class VariablePage extends GrafanaPage_1.GrafanaPage {
      * Clicks the add new variable button and returns the variable edit page
      */
     async clickAddNew() {
-        const { addVariableCTAV2, addVariableCTAV2Item, newButton } = this.ctx.selectors.pages.Dashboard.Settings.Variables.List;
+        const { addVariableCTAV2, newButton } = this.ctx.selectors.pages.Dashboard.Settings.Variables.List;
         if (!this.dashboard?.uid) {
-            await this.getByGrafanaSelector(addVariableCTAV2(addVariableCTAV2Item)).click();
+            await this.getByGrafanaSelector(addVariableCTAV2).click();
         }
         else {
             await this.getByGrafanaSelector(newButton).click();

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 import { Locator, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, Response, TestInfo } from '@playwright/test';
-import { E2ESelectors } from './e2e-selectors/types';
 import { AnnotationEditPage } from './models/pages/AnnotationEditPage';
 import { AppConfigPage } from './models/pages/AppConfigPage';
 import { AppPage } from './models/pages/AppPage';
@@ -11,6 +10,7 @@ import { VariableEditPage } from './models/pages/VariableEditPage';
 import { VariablePage } from './models/pages/VariablePage';
 import { AlertRuleEditPage } from './models/pages/AlertRuleEditPage';
 import { GrafanaAPIClient } from './models/GrafanaAPIClient';
+import { E2ESelectorGroup } from '@grafana/e2e-selectors';
 export type PluginOptions = {
     /**
      * When using the readProvisioning fixture, files will be read from this directory. If no directory is provided,
@@ -73,7 +73,7 @@ export type PluginFixture = {
      * The E2E selectors to use for the current version of Grafana.
      * See https://grafana.com/developers/plugin-tools/e2e-test-a-plugin/selecting-elements#grafana-end-to-end-selectors for more information.
      */
-    selectors: E2ESelectors;
+    selectors: E2ESelectorGroup;
     /**
      * Fixture command that creates a data source via the Grafana API.
      *
@@ -280,7 +280,7 @@ export type PluginFixture = {
  */
 export type PluginTestCtx = {
     grafanaVersion: string;
-    selectors: E2ESelectors;
+    selectors: E2ESelectorGroup;
     testInfo: TestInfo;
 } & Pick<PlaywrightTestArgs, 'page' | 'request'>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.7.2",
+  "version": "1.7.3-canary.1123.1a0c5f5.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -42,6 +42,7 @@
     "dotenv": "^16.3.1"
   },
   "dependencies": {
+    "@grafana/e2e-selectors": "file:@grafana-e2e-selectors-11.3.0-pre.tgz",
     "semver": "^7.5.4",
     "uuid": "^10.0.0",
     "yaml": "^2.3.4"
@@ -55,5 +56,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "64698d0d56bdafb4660ca3b0b0dc66d2b89fc680"
+  "gitHead": "1a0c5f533895916c5f72c2347ed32f62328ee0ea"
 }