Skip to content

Commit 85607cf

Browse files
committed
Fix tests for 11
1 parent 6cf0b51 commit 85607cf

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

e2e/query-editor.spec.ts

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
22
import { selectors } from '@grafana/e2e-selectors';
33
import { test, expect } from '@grafana/plugin-e2e';
44
import { PromOptions } from '@grafana/prometheus';
5-
5+
import semver from 'semver';
66
const codeEditorProvFile = 'code-editor.yml';
77

88
test.describe('Prometheus query editor', () => {
@@ -228,13 +228,13 @@ test.describe('Prometheus query editor', () => {
228228
test('it navigates to the query builder with default editor type as builder', async ({
229229
readProvisionedDataSource,
230230
explorePage,
231-
isFeatureToggleEnabled
231+
isFeatureToggleEnabled,
232232
}) => {
233233
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({
234234
fileName: 'datasources.yml',
235235
});
236236

237-
console.log(await isFeatureToggleEnabled('secureSocksDSProxyEnabled'))
237+
console.log(await isFeatureToggleEnabled('secureSocksDSProxyEnabled'));
238238

239239
await explorePage.datasource.set(ds.name);
240240

@@ -366,32 +366,38 @@ test.describe('Prometheus query editor', () => {
366366
await explorePage.runQuery();
367367
});
368368
*/
369-
// TODO query for metrics explorer button once prometheusUsesCombobox is GA and enabled by default
369+
// TODO query for metrics explorer button once prometheusUsesCombobox is GA and enabled by default
370370
test('it should have the metrics explorer opened via the metric select', async ({
371371
readProvisionedDataSource,
372372
explorePage,
373+
grafanaVersion,
374+
page,
373375
}) => {
374376
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({
375377
fileName: 'datasources.yml',
376378
});
377379

378380
await explorePage.datasource.set(ds.name);
379381

380-
await explorePage
381-
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
382-
.isVisible();
383-
384-
await explorePage
385-
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
386-
.isEnabled();
387-
388-
await explorePage
389-
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
390-
.focus();
391-
392-
await explorePage
393-
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
394-
.click();
382+
if (semver.lte(grafanaVersion, '11.5.4')) {
383+
await page.getByLabel('Metric').isVisible();
384+
} else {
385+
await explorePage
386+
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
387+
.isVisible();
388+
389+
await explorePage
390+
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
391+
.isEnabled();
392+
393+
await explorePage
394+
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
395+
.focus();
396+
397+
await explorePage
398+
.getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)
399+
.click();
400+
}
395401

396402
// await page.getByText('Metrics explorer', { exact: true }).click();
397403

0 commit comments

Comments
 (0)