From 75a714aa51d065ad7f4a9eb71f4cab43215843b3 Mon Sep 17 00:00:00 2001
From: Steven Vachon <contact@svachon.com>
Date: Tue, 30 Jun 2020 09:45:36 -0400
Subject: [PATCH] Added options to customize chart data listening (#25918)

---
 packages/grafana-e2e/src/flows/addPanel.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-e2e/src/flows/addPanel.ts b/packages/grafana-e2e/src/flows/addPanel.ts
index d02429a1028..298439c1670 100644
--- a/packages/grafana-e2e/src/flows/addPanel.ts
+++ b/packages/grafana-e2e/src/flows/addPanel.ts
@@ -4,6 +4,10 @@ import { getScenarioContext } from '../support/scenarioContext';
 import { selectOption } from './selectOption';
 
 export interface AddPanelConfig {
+  chartData: {
+    method: string;
+    route: string | RegExp;
+  };
   dashboardUid: string;
   dataSourceName: string;
   queriesForm: (config: AddPanelConfig) => void;
@@ -16,6 +20,10 @@ export interface AddPanelConfig {
 export const addPanel = (config?: Partial<AddPanelConfig>): any =>
   getScenarioContext().then(({ lastAddedDashboardUid, lastAddedDataSource }: any) => {
     const fullConfig = {
+      chartData: {
+        method: 'POST',
+        route: '/api/ds/query',
+      },
       dashboardUid: lastAddedDashboardUid,
       dataSourceName: lastAddedDataSource,
       panelTitle: `e2e-${Date.now()}`,
@@ -25,7 +33,7 @@ export const addPanel = (config?: Partial<AddPanelConfig>): any =>
       ...config,
     } as AddPanelConfig;
 
-    const { dashboardUid, dataSourceName, panelTitle, queriesForm, visualizationName } = fullConfig;
+    const { chartData, dashboardUid, dataSourceName, panelTitle, queriesForm, visualizationName } = fullConfig;
 
     e2e.flows.openDashboard({ uid: dashboardUid });
     e2e.pages.Dashboard.Toolbar.toolbarItems('Add panel').click();
@@ -36,7 +44,7 @@ export const addPanel = (config?: Partial<AddPanelConfig>): any =>
     // @todo alias '/**/*.js*' as '@pluginModule' when possible: https://github.com/cypress-io/cypress/issues/1296
 
     e2e()
-      .route('POST', '/api/ds/query')
+      .route(chartData.method, chartData.route)
       .as('chartData');
 
     selectOption(e2e.components.DataSourcePicker.container(), dataSourceName);