@grafana/plugin-e2e 1.4.0 → 1.5.0

package/dist/e2e-selectors/types.d.ts

@@ -108,7 +108,7 @@ export type Components = {
     };
     PageToolbar: {
         item: (tooltip: string) => string;
-        shotMoreItems: string;
+        showMoreItems: string;
         itemButton: (title: string) => string;
         itemButtonTitle: string;
     };
@@ -194,6 +194,9 @@ export type Pages = {
     Dashboard: {
         url: (uid: string) => string;
         Settings: {
+            Actions: {
+                close: string;
+            };
             Annotations: {
                 Edit: {
                     url: (dashboardUid: string, annotationIndex: string) => string;
@@ -219,10 +222,23 @@ export type Pages = {
                         generalTypeSelectV2: string;
                         previewOfValuesOption: string;
                         submitButton: string;
+                        generalNameInputV2: string;
+                        applyButton: string;
                     };
                 };
             };
         };
+        SubMenu: {
+            submenuItemLabels: (item: string) => string;
+            submenuItemValueDropDownValueLinkTexts: (item: string) => string;
+            submenuItemValueDropDownDropDown: string;
+            submenuItemValueDropDownOptionTexts: (item: string) => string;
+        };
+        SaveDashboardAsModal: {
+            saveButton: string;
+            newName: string;
+            save: string;
+        };
     };
     Explore: {
         url: string;

package/dist/e2e-selectors/versioned/apis.js

@@ -36,7 +36,7 @@ exports.versionedAPIs = {
     },
     Dashboard: {
         delete: {
-            [constants_1.MIN_GRAFANA_VERSION]: (uid) => `/api/datasources/uid/${uid}`,
+            [constants_1.MIN_GRAFANA_VERSION]: (uid) => `/api/dashboards/uid/${uid}`,
         },
     },
     Plugin: {

package/dist/e2e-selectors/versioned/components.d.ts

@@ -191,7 +191,7 @@ export declare const versionedComponents: {
         item: {
             "8.0.0": (tooltip: string) => string;
         };
-        shotMoreItems: {
+        showMoreItems: {
             "8.0.0": string;
         };
         itemButton: {

package/dist/e2e-selectors/versioned/components.js

@@ -172,7 +172,7 @@ exports.versionedComponents = {
         item: {
             [constants_1.MIN_GRAFANA_VERSION]: (tooltip) => `${tooltip}`,
         },
-        shotMoreItems: {
+        showMoreItems: {
             [constants_1.MIN_GRAFANA_VERSION]: 'Show more items',
         },
         itemButton: {

package/dist/e2e-selectors/versioned/pages.d.ts

@@ -74,6 +74,12 @@ export declare const versionedPages: {
             "8.0.0": (uid: string) => string;
         };
         Settings: {
+            Actions: {
+                close: {
+                    "8.0.0": string;
+                    '9.5.0': string;
+                };
+            };
             Annotations: {
                 Edit: {
                     url: {
@@ -128,10 +134,39 @@ export declare const versionedPages: {
                         selectionOptionsIncludeAllSwitch: {
                             "8.0.0": string;
                         };
+                        generalNameInputV2: {
+                            '8.5.0': string;
+                            "8.0.0": string;
+                        };
+                        applyButton: {
+                            '9.3.0': string;
+                        };
                     };
                 };
             };
         };
+        SubMenu: {
+            submenuItemLabels: {
+                "8.0.0": (item: string) => string;
+            };
+            submenuItemValueDropDownValueLinkTexts: {
+                "8.0.0": (item: string) => string;
+            };
+            submenuItemValueDropDownDropDown: {
+                "8.0.0": string;
+            };
+            submenuItemValueDropDownOptionTexts: {
+                "8.0.0": (item: string) => string;
+            };
+        };
+        SaveDashboardAsModal: {
+            newName: {
+                "8.0.0": string;
+            };
+            save: {
+                "8.0.0": string;
+            };
+        };
     };
     Explore: {
         url: {

package/dist/e2e-selectors/versioned/pages.js

@@ -79,6 +79,12 @@ exports.versionedPages = {
             [constants_1.MIN_GRAFANA_VERSION]: (uid) => `/d/${uid}`,
         },
         Settings: {
+            Actions: {
+                close: {
+                    [constants_1.MIN_GRAFANA_VERSION]: 'Go Back button',
+                    '9.5.0': 'data-testid dashboard-settings-close',
+                },
+            },
             Annotations: {
                 Edit: {
                     url: {
@@ -134,10 +140,37 @@ exports.versionedPages = {
                         selectionOptionsIncludeAllSwitch: {
                             [constants_1.MIN_GRAFANA_VERSION]: 'Variable editor Form IncludeAll switch',
                         },
+                        generalNameInputV2: {
+                            '8.5.0': 'data-testid Variable editor Form Name field',
+                            [constants_1.MIN_GRAFANA_VERSION]: 'Variable editor Form Name field',
+                        },
+                        applyButton: {
+                            '9.3.0': 'data-testid Variable editor Apply button',
+                        },
                     },
                 },
             },
         },
+        SubMenu: {
+            submenuItemLabels: {
+                [constants_1.MIN_GRAFANA_VERSION]: (item) => `data-testid Dashboard template variables submenu Label ${item}`,
+            },
+            submenuItemValueDropDownValueLinkTexts: {
+                [constants_1.MIN_GRAFANA_VERSION]: (item) => `data-testid Dashboard template variables Variable Value DropDown value link text ${item}`,
+            },
+            submenuItemValueDropDownDropDown: { [constants_1.MIN_GRAFANA_VERSION]: 'Variable options' },
+            submenuItemValueDropDownOptionTexts: {
+                [constants_1.MIN_GRAFANA_VERSION]: (item) => `data-testid Dashboard template variables Variable Value DropDown option text ${item}`,
+            },
+        },
+        SaveDashboardAsModal: {
+            newName: {
+                [constants_1.MIN_GRAFANA_VERSION]: 'Save dashboard title field',
+            },
+            save: {
+                [constants_1.MIN_GRAFANA_VERSION]: 'Save dashboard button',
+            },
+        },
     },
     Explore: {
         url: {

package/dist/fixtures/commands/gotoVariablePage.d.ts

@@ -0,0 +1,6 @@
+import { TestFixture } from '@playwright/test';
+import { DashboardPageArgs, PlaywrightArgs } from '../../types';
+import { VariablePage } from '../../models/pages/VariablePage';
+type GotoVariablePageFixture = TestFixture<(args: DashboardPageArgs) => Promise<VariablePage>, PlaywrightArgs>;
+export declare const gotoVariablePage: GotoVariablePageFixture;
+export {};

package/dist/fixtures/commands/gotoVariablePage.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gotoVariablePage = void 0;
+const VariablePage_1 = require("../../models/pages/VariablePage");
+const gotoVariablePage = async ({ request, page, selectors, grafanaVersion }, use, testInfo) => {
+    await use(async (args) => {
+        const variablePage = new VariablePage_1.VariablePage({ page, selectors, grafanaVersion, request, testInfo }, args);
+        await variablePage.goto();
+        return variablePage;
+    });
+};
+exports.gotoVariablePage = gotoVariablePage;

package/dist/fixtures/variablePage.d.ts

@@ -0,0 +1,6 @@
+import { TestFixture } from '@playwright/test';
+import { PlaywrightArgs } from '../types';
+import { VariablePage } from '../models/pages/VariablePage';
+type VariablePageFixture = TestFixture<VariablePage, PlaywrightArgs>;
+export declare const variablePage: VariablePageFixture;
+export {};

package/dist/fixtures/variablePage.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.variablePage = void 0;
+const VariablePage_1 = require("../models/pages/VariablePage");
+const variablePage = async ({ page, selectors, grafanaVersion, request }, use, testInfo) => {
+    const variablePage = new VariablePage_1.VariablePage({ page, selectors, grafanaVersion, request, testInfo });
+    await variablePage.goto();
+    await use(variablePage);
+};
+exports.variablePage = variablePage;

package/dist/index.js

@@ -45,6 +45,8 @@ const options_1 = require("./options");
 const toHaveAlert_1 = require("./matchers/toHaveAlert");
 const toDisplayPreviews_1 = require("./matchers/toDisplayPreviews");
 const toBeOK_1 = require("./matchers/toBeOK");
+const variablePage_1 = require("./fixtures/variablePage");
+const gotoVariablePage_1 = require("./fixtures/commands/gotoVariablePage");
 // models
 var DataSourcePicker_1 = require("./models/components/DataSourcePicker");
 Object.defineProperty(exports, "DataSourcePicker", { enumerable: true, get: function () { return DataSourcePicker_1.DataSourcePicker; } });
@@ -89,6 +91,7 @@ exports.test = test_1.test.extend({
     dashboardPage: dashboardPage_1.dashboardPage,
     panelEditPage: panelEditPage_1.panelEditPage,
     variableEditPage: variableEditPage_1.variableEditPage,
+    variablePage: variablePage_1.variablePage,
     annotationEditPage: annotationEditPage_1.annotationEditPage,
     alertRuleEditPage: alertRuleEditPage_1.alertRuleEditPage,
     explorePage: explorePage_1.explorePage,
@@ -101,6 +104,7 @@ exports.test = test_1.test.extend({
     gotoDashboardPage: gotoDashboardPage_1.gotoDashboardPage,
     gotoPanelEditPage: gotoPanelEditPage_1.gotoPanelEditPage,
     gotoVariableEditPage: gotoVariableEditPage_1.gotoVariableEditPage,
+    gotoVariablePage: gotoVariablePage_1.gotoVariablePage,
     gotoAnnotationEditPage: gotoAnnotationEditPage_1.gotoAnnotationEditPage,
     gotoAlertRuleEditPage: gotoAlertRuleEditPage_1.gotoAlertRuleEditPage,
     gotoDataSourceConfigPage: gotoDataSourceConfigPage_1.gotoDataSourceConfigPage,

package/dist/models/pages/ExplorePage.js

@@ -86,7 +86,7 @@ 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.shotMoreItems)).click();
+            await this.getByGrafanaSelector(components.PageToolbar.item(components.PageToolbar.showMoreItems)).click();
             await this.getByGrafanaSelector(components.RefreshPicker.runButtonV2).last().click();
         }
         return responsePromise;

package/dist/types.d.ts

@@ -8,6 +8,7 @@ import { DataSourceConfigPage } from './models/pages/DataSourceConfigPage';
 import { ExplorePage } from './models/pages/ExplorePage';
 import { PanelEditPage } from './models/pages/PanelEditPage';
 import { VariableEditPage } from './models/pages/VariableEditPage';
+import { VariablePage } from './models/pages/VariablePage';
 import { AlertRuleEditPage } from './models/pages/AlertRuleEditPage';
 export type PluginOptions = {
     /**
@@ -193,6 +194,13 @@ export type PluginFixture = {
      * To load an existing dashboard with an existing variable, use the {@link gotoVariableEditPage} fixture.
      */
     variableEditPage: VariableEditPage;
+    /**
+     * Isolated {@link VariablePage} instance for each test.
+     *
+     * When using this fixture in a test, you will get a new dashboard page with a new empty variable edit page
+     * To load an existing dashboard with an existing variable, use the {@link gotoVariableEditPage} fixture.
+     */
+    variablePage: VariablePage;
     /**
      * Isolated {@link AnnotationEditPage} instance for each test.
      *
@@ -230,6 +238,10 @@ export type PluginFixture = {
      * Fixture command that navigates a variable edit page for an already existing variable query in a dashboard.
      */
     gotoVariableEditPage: (args: DashboardEditViewArgs<string>) => Promise<VariableEditPage>;
+    /**
+     * Fixture command that navigates a variable edit page for an already existing variable query in a dashboard.
+     */
+    gotoVariablePage: (args: DashboardPageArgs) => Promise<VariablePage>;
     /**
      * Fixture command that navigates an annotation edit page for an already existing annotation query in a dashboard.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -55,5 +55,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "8a883c5069c25ba18070b88a83ac0eb46b097720"
+  "gitHead": "c323be85acf515e6e5f82bf4b705118fc89da74e"
 }