Skip to content
This repository was archived by the owner on Sep 29, 2025. It is now read-only.

Commit 3a33315

Browse files
authored
Update E2E tests to fix Main compatibility (#107)
* upd e2e * upd e2e
1 parent fd210bd commit 3a33315

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

test/panel.spec.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { test, expect } from '@grafana/plugin-e2e';
22
import { ConfigEditorHelper, QueryEditorHelper, PanelHelper } from './utils';
3+
import * as semver from 'semver';
34

45
test.describe('Static Data Source', () => {
56
test('Check grafana version', async ({ grafanaVersion }) => {
@@ -23,6 +24,7 @@ test.describe('Static Data Source', () => {
2324
page,
2425
selectors,
2526
panelEditPage,
27+
grafanaVersion,
2628
readProvisionedDataSource,
2729
}) => {
2830
const ds = await readProvisionedDataSource({ fileName: 'datasources.yaml' });
@@ -63,13 +65,19 @@ test.describe('Static Data Source', () => {
6365
await secondRow.setValue('name', 'name 2');
6466
await secondRow.setValue('value', 'value 2');
6567

66-
await expect(panelEditPage.panel.data).toContainText(['value 1', 'name 1', 'value 2', 'name 2']);
68+
if (semver.lt(grafanaVersion, '11.1.0')) {
69+
await expect(panelEditPage.panel.data).toContainText(['value 1', 'name 1', 'value 2', 'name 2']);
70+
} else {
71+
const panelContent = panelEditPage.panel.getByGrafanaSelector(selectors.components.Panels.Panel.content);
72+
await expect(panelContent).toContainText(['valuenamevalue 1name 1value 2name 2']);
73+
}
6774
});
6875

6976
test('Table query should return columns via code query editor', async ({
7077
page,
7178
selectors,
7279
panelEditPage,
80+
grafanaVersion,
7381
readProvisionedDataSource,
7482
}) => {
7583
const ds = await readProvisionedDataSource({ fileName: 'datasources.yaml' });
@@ -113,7 +121,13 @@ test.describe('Static Data Source', () => {
113121
await fieldName.checkName('name');
114122

115123
await expect(panelEditPage.panel.fieldNames).toContainText(['value', 'name']);
116-
await expect(panelEditPage.panel.data).toContainText(['test1', 'test1', 'test2', 'test2']);
124+
125+
if (semver.lt(grafanaVersion, '11.1.0')) {
126+
await expect(panelEditPage.panel.data).toContainText(['test1', 'test1', 'test2', 'test2']);
127+
} else {
128+
const panelContent = panelEditPage.panel.getByGrafanaSelector(selectors.components.Panels.Panel.content);
129+
await expect(panelContent).toContainText(['valuenametest1test1test2test2']);
130+
}
117131
});
118132
});
119133

0 commit comments

Comments
 (0)