IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Timeseries: Update auto-migration e2e test (#67402)

Browse Source
This commit is contained in:
Adela Almasan 2023-04-27 10:20:07 -05:00 committed by GitHub
parent a5206a1cda
commit 62587eee88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/various-suite/graph-auto-migrate.spec.ts
View File

@ -35,7 +35,7 @@ e2e.scenario({
e2e.pages.Dashboard.Annotations.marker().should('exist'); e2e.pages.Dashboard.Annotations.marker().should('exist');
}); });
e2e.pages.Dashboard.wrapper().children().children('.scrollbar-view').scrollTo('bottom'); cy.get('body').children().find('.scrollbar-view').first().scrollTo('bottom');
e2e.components.Panels.Panel.title('05:00') e2e.components.Panels.Panel.title('05:00')
.should('exist') .should('exist')

1
packages/grafana-e2e-selectors/src/selectors/pages.ts
View File

@ -49,7 +49,6 @@ export const Pages = {
}, },
Dashboard: { Dashboard: {
url: (uid: string) => `/d/${uid}`, url: (uid: string) => `/d/${uid}`,
wrapper: 'data-testid dashboard-page-wrapper',
DashNav: { DashNav: {
/** /**
* @deprecated use navV2 from Grafana 8.3 instead * @deprecated use navV2 from Grafana 8.3 instead

3
public/app/core/components/Page/Page.tsx
View File

@ -3,7 +3,6 @@ import { css, cx } from '@emotion/css';
import React, { useLayoutEffect } from 'react'; import React, { useLayoutEffect } from 'react';
import { GrafanaTheme2, PageLayoutType } from '@grafana/data'; import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { CustomScrollbar, useStyles2 } from '@grafana/ui'; import { CustomScrollbar, useStyles2 } from '@grafana/ui';
import { useGrafana } from 'app/core/context/GrafanaContext'; import { useGrafana } from 'app/core/context/GrafanaContext';
@ -51,7 +50,7 @@ export const Page: PageType = ({
}, [navModel, pageNav, chrome, layout]); }, [navModel, pageNav, chrome, layout]);
return ( return (
<div className={cx(styles.wrapper, className)} {...otherProps} data-testid={selectors.pages.Dashboard.wrapper}> <div className={cx(styles.wrapper, className)} {...otherProps}>
{layout === PageLayoutType.Standard && ( {layout === PageLayoutType.Standard && (
<CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}> <CustomScrollbar autoHeightMin={'100%'} scrollTop={scrollTop} scrollRefCallback={scrollRef}>
<div className={styles.pageInner}> <div className={styles.pageInner}>