@grafana/plugin-e2e 1.7.2 → 1.8.0-canary.1111.faecd66.0

package/dist/models/pages/AlertRuleEditPage.js

@@ -31,7 +31,7 @@ class AlertRuleEditPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
     }

package/dist/models/pages/AnnotationEditPage.js

@@ -32,7 +32,7 @@ class AnnotationEditPage extends GrafanaPage_1.GrafanaPage {
     args;
     datasource;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);

package/dist/models/pages/AnnotationPage.js

@@ -31,7 +31,7 @@ class AnnotationPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     dashboard;
     constructor(ctx, dashboard) {
-        super(ctx);
+        super(ctx, dashboard);
         this.ctx = ctx;
         this.dashboard = dashboard;
     }

package/dist/models/pages/AppPage.js

@@ -30,7 +30,7 @@ class AppPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
     }

package/dist/models/pages/DashboardPage.js

@@ -36,7 +36,7 @@ class DashboardPage extends GrafanaPage_1.GrafanaPage {
     dataSourcePicker;
     timeRange;
     constructor(ctx, dashboard) {
-        super(ctx);
+        super(ctx, dashboard);
         this.ctx = ctx;
         this.dashboard = dashboard;
         this.dataSourcePicker = new DataSourcePicker_1.DataSourcePicker(ctx);

package/dist/models/pages/ExplorePage.d.ts

@@ -1,14 +1,15 @@
 import { Locator } from '@playwright/test';
-import { NavigateOptions, PluginTestCtx, RequestOptions } from '../../types';
+import { GrafanaPageArgs, NavigateOptions, PluginTestCtx, RequestOptions } from '../../types';
 import { DataSourcePicker } from '../components/DataSourcePicker';
 import { GrafanaPage } from './GrafanaPage';
 import { Panel } from '../components/Panel';
 export declare class ExplorePage extends GrafanaPage {
+    readonly args?: GrafanaPageArgs | undefined;
     datasource: DataSourcePicker;
     timeRange: any;
     timeSeriesPanel: Panel;
     tablePanel: Panel;
-    constructor(ctx: PluginTestCtx);
+    constructor(ctx: PluginTestCtx, args?: GrafanaPageArgs | undefined);
     private getPanelLocators;
     /**
      * Navigates to the explore page.

package/dist/models/pages/ExplorePage.js

@@ -34,12 +34,14 @@ const TABLE_PANEL_SELECTOR_SUFFIX = 'Table';
 const TIME_SERIES_PANEL_TEXT = 'Graph Lines Bars Points';
 const TABLE_PANEL_TEXT = 'Table';
 class ExplorePage extends GrafanaPage_1.GrafanaPage {
+    args;
     datasource;
     timeRange;
     timeSeriesPanel;
     tablePanel;
-    constructor(ctx) {
-        super(ctx);
+    constructor(ctx, args) {
+        super(ctx, args);
+        this.args = args;
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);
         this.timeRange = new TimeRange_1.TimeRange(ctx);
         this.timeSeriesPanel = new Panel_1.Panel(this.ctx, this.getPanelLocators(TIME_SERIES_PANEL_SELECTOR_SUFFIX, TIME_SERIES_PANEL_TEXT));

package/dist/models/pages/GrafanaPage.d.ts

@@ -1,5 +1,5 @@
 import { Locator, Request, Response } from '@playwright/test';
-import { getByGrafanaSelectorOptions, NavigateOptions, PluginTestCtx } from '../../types';
+import { getByGrafanaSelectorOptions, GrafanaPageArgs, NavigateOptions, PluginTestCtx } from '../../types';
 /**
  * Base class for all Grafana pages.
  *
@@ -7,7 +7,8 @@ import { getByGrafanaSelectorOptions, NavigateOptions, PluginTestCtx } from '../
  */
 export declare abstract class GrafanaPage {
     readonly ctx: PluginTestCtx;
-    constructor(ctx: PluginTestCtx);
+    readonly pageArgs: GrafanaPageArgs;
+    constructor(ctx: PluginTestCtx, pageArgs?: GrafanaPageArgs);
     protected navigate(url: string, options?: NavigateOptions): Promise<void>;
     /**
      * Get a locator based on a Grafana E2E selector. A grafana E2E selector is defined in @grafana/e2e-selectors or in plugin-e2e/src/e2e-selectors.

package/dist/models/pages/GrafanaPage.js

@@ -8,15 +8,19 @@ exports.GrafanaPage = void 0;
  */
 class GrafanaPage {
     ctx;
-    constructor(ctx) {
+    pageArgs;
+    constructor(ctx, pageArgs = {}) {
         this.ctx = ctx;
+        this.pageArgs = pageArgs;
     }
     async navigate(url, options) {
-        if (options?.queryParams) {
-            url += `?${options.queryParams.toString()}`;
+        let queryParams = options?.queryParams ? options.queryParams : this.pageArgs.queryParams;
+        if (queryParams) {
+            url += `?${queryParams.toString()}`;
         }
         await this.ctx.page.goto(url, {
             waitUntil: 'networkidle',
+            ...this.pageArgs,
             ...options,
         });
     }

package/dist/models/pages/PanelEditPage.js

@@ -38,7 +38,7 @@ class PanelEditPage extends GrafanaPage_1.GrafanaPage {
     timeRange;
     panel;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);

package/dist/models/pages/PluginConfigPage.js

@@ -6,7 +6,7 @@ class PluginConfigPage extends GrafanaPage_1.GrafanaPage {
     ctx;
     args;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
     }

package/dist/models/pages/VariableEditPage.js

@@ -32,7 +32,7 @@ class VariableEditPage extends GrafanaPage_1.GrafanaPage {
     args;
     datasource;
     constructor(ctx, args) {
-        super(ctx);
+        super(ctx, args);
         this.ctx = ctx;
         this.args = args;
         this.datasource = new DataSourcePicker_1.DataSourcePicker(ctx);

package/dist/models/pages/VariablePage.js

@@ -7,7 +7,7 @@ class VariablePage extends GrafanaPage_1.GrafanaPage {
     ctx;
     dashboard;
     constructor(ctx, dashboard) {
-        super(ctx);
+        super(ctx, dashboard);
         this.ctx = ctx;
         this.dashboard = dashboard;
     }

package/dist/types.d.ts

@@ -386,7 +386,8 @@ export interface TimeRangeArgs {
      */
     zone?: string;
 }
-export type DashboardPageArgs = {
+export type GrafanaPageArgs = NavigateOptions;
+export type DashboardPageArgs = GrafanaPageArgs & {
     /**
      * The uid of the dashboard to go to
      */
@@ -407,11 +408,11 @@ export type DashboardPageArgs = {
  * If dashboard is not specified, it's assumed that it's a new dashboard. Otherwise, the dashboard uid is used to
  * navigate to an already existing dashboard.
  */
-export type DashboardEditViewArgs<T> = {
+export type DashboardEditViewArgs<T> = GrafanaPageArgs & {
     dashboard?: DashboardPageArgs;
     id: T;
 };
-export type AlertRuleArgs = {
+export type AlertRuleArgs = GrafanaPageArgs & {
     uid: string;
 };
 export type ReadProvisionedDashboardArgs = {
@@ -444,7 +445,7 @@ export type ReadProvisionedDataSourceArgs = {
      */
     name?: string;
 };
-export type PluginPageArgs = {
+export type PluginPageArgs = GrafanaPageArgs & {
     pluginId: string;
 };
 export type GotoAppConfigPageArgs = PluginPageArgs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.7.2",
+  "version": "1.8.0-canary.1111.faecd66.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -55,5 +55,5 @@
       "start": "cls || clear"
     }
   },
-  "gitHead": "64698d0d56bdafb4660ca3b0b0dc66d2b89fc680"
+  "gitHead": "faecd66fa1f3e3209108c979984f3595c4cfe577"
 }