public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prometheus: Migrate remaining selectors to data-testid (#106564)

Browse Source
This commit is contained in:
Ida Štambuk
2025-06-26 12:22:42 +02:00
committed by GitHub
parent 2297417374
commit 2e9c4a76c4
7 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/old-arch/various-suite/prometheus-annotations.spec.ts
+1 -3
View File
@@ -1,5 +1,3 @@
import { selectors } from '@grafana/e2e-selectors';
import { e2e } from '../utils';
import { addDashboard } from '../utils/flows';
@@ -56,7 +54,7 @@ describe('Prometheus annotations', () => {
// check for other parts of the annotations
// min step
cy.get(`#${selectors.components.DataSource.Prometheus.annotations.minStep}`);
e2e.components.DataSource.Prometheus.annotations.minStep().should('exist');
// title
e2e.components.DataSource.Prometheus.annotations.title().scrollIntoView().should('exist');
e2e/old-arch/various-suite/prometheus-editor.spec.ts
+2 -2
View File
@@ -65,9 +65,9 @@ describe('Prometheus query editor', () => {
// check options
e2e.components.DataSource.Prometheus.queryEditor.legend().scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.format().scrollIntoView().should('exist');
cy.get(`[data-test-id="prometheus-step"]`).scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.step().scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.type().scrollIntoView().should('exist');
cy.get(`[data-testid="prometheus-exemplars"]`).scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.exemplars().scrollIntoView().should('exist');
});
describe('Code editor', () => {
e2e/various-suite/prometheus-annotations.spec.ts
+1 -3
View File
@@ -1,5 +1,3 @@
import { selectors } from '@grafana/e2e-selectors';
import { e2e } from '../utils';
import { addDashboard } from '../utils/flows';
@@ -57,7 +55,7 @@ describe('Prometheus annotations', () => {
// check for other parts of the annotations
// min step
cy.get(`#${selectors.components.DataSource.Prometheus.annotations.minStep}`);
e2e.components.DataSource.Prometheus.annotations.minStep().should('exist');
// title
e2e.components.DataSource.Prometheus.annotations.title().scrollIntoView().should('exist');
e2e/various-suite/prometheus-editor.spec.ts
+2 -2
View File
@@ -65,9 +65,9 @@ describe.skip('Prometheus query editor', () => {
// check options
e2e.components.DataSource.Prometheus.queryEditor.legend().scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.format().scrollIntoView().should('exist');
cy.get(`[data-test-id="prometheus-step"]`).scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.step().scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.type().scrollIntoView().should('exist');
cy.get(`[data-testid="prometheus-exemplars"]`).scrollIntoView().should('exist');
e2e.components.DataSource.Prometheus.queryEditor.exemplars().scrollIntoView().should('exist');
});
describe('Code editor', () => {
packages/grafana-e2e-selectors/src/selectors/components.ts
+3 -3
View File
@@ -250,13 +250,13 @@ export const versionedComponents = {
'10.4.0': 'data-testid prometheus format',
},
step: {
'10.4.0': 'prometheus-step', // id for autosize component
'10.4.0': 'data-testid prometheus-step', // id for autosize component
},
type: {
'10.4.0': 'data-testid prometheus type', //wrapper for radio button group
},
exemplars: {
'10.4.0': 'prometheus-exemplars', // id for editor switch component
'10.4.0': 'data-testid prometheus-exemplars', // id for editor switch component
},
builder: {
// see QueryBuilder below for commented selectors
@@ -349,7 +349,7 @@ export const versionedComponents = {
},
annotations: {
minStep: {
'10.4.0': 'prometheus-annotation-min-step', // id for autosize input
'10.4.0': 'data-testid prometheus-annotation-min-step', // id for autosize input
},
title: {
'10.4.0': 'data-testid prometheus annotation title',
packages/grafana-prometheus/src/components/AnnotationQueryEditor.tsx
+1
View File
@@ -100,6 +100,7 @@ export const AnnotationQueryEditor = memo(function AnnotationQueryEditor(props:
value={query.interval ?? ''}
onChange={(e) => handleMinStepChange(e.currentTarget.value)}
id={selectors.components.DataSource.Prometheus.annotations.minStep}
data-testid={selectors.components.DataSource.Prometheus.annotations.minStep}
/>
</EditorField>
</EditorRow>
packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderOptions.tsx
+1 -1
View File
@@ -115,7 +115,7 @@ export const PromQueryBuilderOptions = React.memo<PromQueryBuilderOptionsProps>(
minWidth={10}
onCommitChange={onChangeStep}
defaultValue={query.interval}
data-test-id="prometheus-step"
data-testid={selectors.components.DataSource.Prometheus.queryEditor.step}
/>
</EditorField>
<EditorField label={t('grafana-prometheus.querybuilder.prom-query-builder-options.label-format', 'Format')}>