Fix e2e for main grafana

VolkovLabs · Sep 30, 2024 · b9fcd34 · b9fcd34
1 parent 858e260
commit b9fcd34
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@grafana/eslint-config": "^7.0.0",
-    "@grafana/plugin-e2e": "^1.7.1",
+    "@grafana/plugin-e2e": "^1.8.2",
     "@grafana/tsconfig": "^2.0.0",
     "@swc/core": "^1.7.23",
     "@swc/helpers": "^0.5.13",

diff --git a/provisioning/dashboards/devices.json b/provisioning/dashboards/devices.json
@@ -18,6 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": 2,
   "links": [],
   "panels": [
     {
@@ -140,7 +141,7 @@
                 "editorMode": "code",
                 "format": "table",
                 "rawQuery": true,
-                "rawSql": "select * from comments WHERE id IN (${payload.ids:sqlstring});",
+                "rawSql": "select * from comments WHERE id IN (${payload.ids:csv});",
                 "refId": "A",
                 "sql": {
                   "columns": [
@@ -214,7 +215,7 @@
                 "editorMode": "code",
                 "format": "table",
                 "rawQuery": true,
-                "rawSql": "select id, title from comments WHERE id IN (${payload.ids:sqlstring});",
+                "rawSql": "select id, title from comments WHERE id IN (${payload.ids:csv});",
                 "refId": "A",
                 "sql": {
                   "columns": [
@@ -834,7 +835,7 @@
           "export": false
         }
       },
-      "pluginVersion": "1.3.0",
+      "pluginVersion": "1.4.0",
       "targets": [
         {
           "datasource": {
@@ -996,7 +997,8 @@
       "type": "volkovlabs-table-panel"
     }
   ],
-  "schemaVersion": 39,
+  "preload": false,
+  "schemaVersion": 40,
   "tags": [],
   "templating": {
     "list": []
@@ -1009,6 +1011,6 @@
   "timezone": "browser",
   "title": "Devices",
   "uid": "edxke3hyi04cgc",
-  "version": 21,
+  "version": 1,
   "weekStart": ""
 }
diff --git a/test/panel.spec.ts b/test/panel.spec.ts
@@ -3,12 +3,18 @@ import { test, expect } from '@grafana/plugin-e2e';
 import { PanelHelper } from './utils';
 
 test.describe('Business Table Panel', () => {
+  /**
+   * Disable scenes for tests with panel edit
+   */
+  const sceneDisabledParams = new URLSearchParams();
+  sceneDisabledParams.set('scenes', 'false');
+
   test('Check grafana version', async ({ grafanaVersion }) => {
     console.log('Grafana version: ', grafanaVersion);
     expect(grafanaVersion).toEqual(grafanaVersion);
   });
 
-  test('Should display a Table', async ({ gotoDashboardPage, readProvisionedDashboard, page }) => {
+  test('Should display a Table', async ({ gotoDashboardPage, readProvisionedDashboard }) => {
     /**
      * Go To Panels dashboard panels.json
      * return dashboardPage
@@ -35,7 +41,7 @@ test.describe('Business Table Panel', () => {
      * return dashboardPage
      */
     const dashboard = await readProvisionedDashboard({ fileName: 'panels.json' });
-    const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid });
+    const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid, queryParams: sceneDisabledParams });
 
     /**
      * Add new visualization
@@ -56,14 +62,13 @@ test.describe('Business Table Panel', () => {
     gotoDashboardPage,
     page,
     readProvisionedDashboard,
-    selectors,
   }) => {
     /**
      * Go To Panels dashboard panels.json
      * return dashboardPage
      */
     const dashboard = await readProvisionedDashboard({ fileName: 'panels.json' });
-    const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid });
+    const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid, queryParams: sceneDisabledParams });
 
     /**
      * Add new visualization
@@ -125,7 +130,7 @@ test.describe('Business Table Panel', () => {
     await header.getHeaderCell('A-series').checkText('A-series');
   });
 
-  test('Should toggle tables via tabs', async ({ gotoDashboardPage, page, readProvisionedDashboard }) => {
+  test('Should toggle tables via tabs', async ({ gotoDashboardPage, readProvisionedDashboard }) => {
     /**
      * Go To Panels dashboard panels.json
      * return dashboardPage
@@ -169,7 +174,7 @@ test.describe('Business Table Panel', () => {
        * return dashboardPage
        */
       const dashboard = await readProvisionedDashboard({ fileName: 'devices.json' });
-      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid });
+      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid, queryParams: sceneDisabledParams });
 
       /**
        * Add new visualization
@@ -257,7 +262,7 @@ test.describe('Business Table Panel', () => {
   });
 
   test.describe('Filtering', () => {
-    test('Should filter table', async ({ page, gotoDashboardPage, readProvisionedDashboard }) => {
+    test('Should filter table', async ({ gotoDashboardPage, readProvisionedDashboard }) => {
       /**
        * Go To Panels dashboard panels.json
        * return dashboardPage
@@ -303,7 +308,10 @@ test.describe('Business Table Panel', () => {
        * return dashboardPage
        */
       const dashboard = await readProvisionedDashboard({ fileName: 'devices.json' });
-      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid });
+      /**
+       * Disable scene due until refresh panel data issue is resolved
+       */
+      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid, queryParams: sceneDisabledParams });
 
       /**
        * Get Table panel
@@ -365,7 +373,10 @@ test.describe('Business Table Panel', () => {
        * return dashboardPage
        */
       const dashboard = await readProvisionedDashboard({ fileName: 'devices.json' });
-      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid });
+      /**
+       * Disable scene due until refresh panel data issue is resolved
+       */
+      const dashboardPage = await gotoDashboardPage({ uid: dashboard.uid, queryParams: sceneDisabledParams });
 
       /**
        * Get Table panel