Skip to content

Commit 0bd9abc

Browse files
committed
Enable combobox toggle by default
1 parent 9eced2a commit 0bd9abc

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
context: ./.config
2525
args:
2626
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
27-
grafana_version: ${GRAFANA_VERSION:-11.5.0}
27+
grafana_version: ${GRAFANA_VERSION:-12.0.0}
2828
ports:
2929
- 3000:3000/tcp
3030
- 2345:2345/tcp # delve

e2e/query-editor.spec.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ import { PromOptions } from '@grafana/prometheus';
55

66
const codeEditorProvFile = 'code-editor.yml';
77

8+
test.use({
9+
featureToggles: {
10+
prometheusUsesCombobox: true,
11+
},
12+
});
13+
814
test.describe('Prometheus query editor', () => {
915
test(`should have the following components:
1016
kickstart component
@@ -230,7 +236,9 @@ test.describe('Prometheus query editor', () => {
230236
explorePage,
231237
page,
232238
}) => {
233-
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
239+
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({
240+
fileName: 'datasources.yml',
241+
});
234242

235243
await explorePage.datasource.set(ds.name);
236244

@@ -256,7 +264,9 @@ test.describe('Prometheus query editor', () => {
256264
explorePage,
257265
page,
258266
}) => {
259-
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
267+
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({
268+
fileName: 'datasources.yml',
269+
});
260270

261271
await explorePage.datasource.set(ds.name);
262272

@@ -365,7 +375,9 @@ test.describe('Prometheus query editor', () => {
365375
readProvisionedDataSource,
366376
explorePage,
367377
}) => {
368-
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
378+
const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({
379+
fileName: 'datasources.yml',
380+
});
369381

370382
await explorePage.datasource.set(ds.name);
371383

0 commit comments

Comments
 (0)