diff --git a/e2e/various-suite/filter-annotations.spec.ts b/e2e/various-suite/filter-annotations.spec.ts index c6b17f33950..4233ba2cb66 100644 --- a/e2e/various-suite/filter-annotations.spec.ts +++ b/e2e/various-suite/filter-annotations.spec.ts @@ -55,7 +55,7 @@ e2e.scenario({ e2e.components.Panels.Panel.title('Panel one') .should('exist') .within(() => { - e2e.pages.SoloPanel.Annotations.marker().should('exist').should('have.length', 4); + e2e.pages.Dashboard.Annotations.marker().should('exist').should('have.length', 4); }); }, }); diff --git a/e2e/various-suite/query-editor.spec.ts b/e2e/various-suite/query-editor.spec.ts index 525b053216e..0f1ab90e98d 100644 --- a/e2e/various-suite/query-editor.spec.ts +++ b/e2e/various-suite/query-editor.spec.ts @@ -2,7 +2,7 @@ import { e2e } from '@grafana/e2e'; e2e.scenario({ describeName: 'Query editor', - itName: 'Undo should work in query editor for prometheus.', + itName: 'Undo should work in query editor for prometheus -- test CI.', addScenarioDataSource: false, addScenarioDashBoard: false, skipScenario: false, diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts index 33b7b282711..b7f1ca5448b 100644 --- a/packages/grafana-e2e-selectors/src/selectors/pages.ts +++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts @@ -177,6 +177,9 @@ export const Pages = { }, }, }, + Annotations: { + marker: 'data-testid annotation-marker', + }, }, Dashboards: { url: '/dashboards', @@ -249,9 +252,6 @@ export const Pages = { }, SoloPanel: { url: (page: string) => `/d-solo/${page}`, - Annotations: { - marker: 'data-testid annotation-marker', - }, }, PluginsList: { page: 'Plugins list page', diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx index 72bc4d74da7..0b111de0cef 100644 --- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx +++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx @@ -127,7 +127,7 @@ export function AnnotationMarker({ annotation, timeZone, width }: Props) { onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} className={!isRegionAnnotation ? styles.markerWrapper : undefined} - data-testid={selectors.pages.SoloPanel.Annotations.marker} + data-testid={selectors.pages.Dashboard.Annotations.marker} > {marker}