@@ -2,7 +2,7 @@ import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
2
2
import { selectors } from '@grafana/e2e-selectors' ;
3
3
import { test , expect } from '@grafana/plugin-e2e' ;
4
4
import { PromOptions } from '@grafana/prometheus' ;
5
-
5
+ import semver from 'semver' ;
6
6
const codeEditorProvFile = 'code-editor.yml' ;
7
7
8
8
test . describe ( 'Prometheus query editor' , ( ) => {
@@ -228,13 +228,13 @@ test.describe('Prometheus query editor', () => {
228
228
test ( 'it navigates to the query builder with default editor type as builder' , async ( {
229
229
readProvisionedDataSource,
230
230
explorePage,
231
- isFeatureToggleEnabled
231
+ isFeatureToggleEnabled,
232
232
} ) => {
233
233
const ds = await readProvisionedDataSource < DataSourcePluginOptionsEditorProps < PromOptions > > ( {
234
234
fileName : 'datasources.yml' ,
235
235
} ) ;
236
236
237
- console . log ( await isFeatureToggleEnabled ( 'secureSocksDSProxyEnabled' ) )
237
+ console . log ( await isFeatureToggleEnabled ( 'secureSocksDSProxyEnabled' ) ) ;
238
238
239
239
await explorePage . datasource . set ( ds . name ) ;
240
240
@@ -366,32 +366,38 @@ test.describe('Prometheus query editor', () => {
366
366
await explorePage.runQuery();
367
367
});
368
368
*/
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
370
370
test ( 'it should have the metrics explorer opened via the metric select' , async ( {
371
371
readProvisionedDataSource,
372
372
explorePage,
373
+ grafanaVersion,
374
+ page,
373
375
} ) => {
374
376
const ds = await readProvisionedDataSource < DataSourcePluginOptionsEditorProps < PromOptions > > ( {
375
377
fileName : 'datasources.yml' ,
376
378
} ) ;
377
379
378
380
await explorePage . datasource . set ( ds . name ) ;
379
381
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
+ }
395
401
396
402
// await page.getByText('Metrics explorer', { exact: true }).click();
397
403
0 commit comments