Skip to content

Commit 3fdf1d1

Browse files
Al-Danigeorgylobko
authored andcommitted
chore: Fix elements scrolling with elementScrollTo in integration tests (#3138)
1 parent 0152cb3 commit 3fdf1d1

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

src/app-layout/__integ__/app-layout-drawers.test.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import { viewports } from './constants';
99
import { testIf } from './utils';
1010

1111
const wrapper = createWrapper().findAppLayout();
12+
import vrDrawerStyles from '../../../lib/components/app-layout/visual-refresh/styles.selectors.js';
13+
import vrToolbarDrawerStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/drawer/styles.selectors.js';
1214

1315
class AppLayoutDrawersPage extends BasePageObject {
1416
async openFirstDrawer() {
@@ -242,7 +244,14 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as const)('%s', theme =>
242244
setupTest({ theme }, async page => {
243245
await page.openFirstDrawer();
244246
const resizeHandleBefore = await page.getResizeHandlePosition();
245-
await page.elementScrollTo(wrapper.findActiveDrawer().toSelector(), { top: 100 });
247+
const scrollableContainer =
248+
theme === 'classic'
249+
? wrapper.findActiveDrawer().toSelector()
250+
: theme === 'refresh'
251+
? `.${vrDrawerStyles['drawer-content-container']}`
252+
: `.${vrToolbarDrawerStyles['drawer-content-container']}`;
253+
254+
await page.elementScrollTo(scrollableContainer, { top: 100 });
246255
const resizeHandleAfter = await page.getResizeHandlePosition();
247256
await expect(resizeHandleAfter).toEqual(resizeHandleBefore);
248257
})

src/app-layout/__integ__/runtime-drawers.test.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import createWrapper, { AppLayoutWrapper } from '../../../lib/components/test-ut
77
import { viewports } from './constants';
88
import { getUrlParams, Theme } from './utils';
99

10+
import vrDrawerStyles from '../../../lib/components/app-layout/visual-refresh/styles.selectors.js';
11+
import vrToolbarDrawerStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/drawer/styles.selectors.js';
12+
1013
const wrapper = createWrapper().findAppLayout();
1114
const findDrawerById = (wrapper: AppLayoutWrapper, id: string) => {
1215
return wrapper.find(`[data-testid="awsui-app-layout-drawer-${id}"]`);
@@ -117,7 +120,14 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme
117120
const getScrollPosition = () => page.getBoundingBox('[data-testid="drawer-sticky-header"]');
118121
const scrollBefore = await getScrollPosition();
119122

120-
await page.elementScrollTo(wrapper.findActiveDrawer().toSelector(), { top: 100 });
123+
const scrollableContainer =
124+
theme === 'classic'
125+
? wrapper.findActiveDrawer().toSelector()
126+
: theme === 'refresh'
127+
? `.${vrDrawerStyles['drawer-content-container']}`
128+
: `.${vrToolbarDrawerStyles['drawer-content-container']}`;
129+
130+
await page.elementScrollTo(scrollableContainer, { top: 100 });
121131
await expect(getScrollPosition()).resolves.toEqual(scrollBefore);
122132
await expect(page.isDisplayed('[data-testid="drawer-sticky-header"]')).resolves.toBe(true);
123133
})
@@ -316,7 +326,8 @@ describe('Visual refresh toolbar only', () => {
316326
const getScrollPosition = () => page.getBoundingBox('[data-testid="drawer-sticky-header"]');
317327
const scrollBefore = await getScrollPosition();
318328

319-
await page.elementScrollTo(wrapper.findActiveDrawer().toSelector(), { top: 100 });
329+
const scrollableContainer = `.${vrToolbarDrawerStyles['drawer-content-container']}`;
330+
await page.elementScrollTo(scrollableContainer, { top: 100 });
320331
await expect(getScrollPosition()).resolves.toEqual(scrollBefore);
321332
await expect(page.isDisplayed('[data-testid="drawer-sticky-header"]')).resolves.toBe(true);
322333
})

src/cards/__integ__/sticky-header.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Cards Sticky Header', () => {
4444
const scrollTopToBtn = '#scroll-to-top-btn';
4545
const toggleStickinessBtn = '#toggle-stickiness-btn';
4646
const toggleVerticalOffsetBtn = '#toggle-vertical-offset-btn';
47-
const overflowParentPageHeight = 300;
47+
const overflowParentPageHeight = 400;
4848
const verticalOffset = 50;
4949

5050
test(

src/pie-chart/__integ__/pie-chart.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ describe('Legend', () => {
209209
'can be controlled with mouse',
210210
setupTest(async page => {
211211
// Hover over second segment in the legend
212-
await page.elementScrollTo(legendWrapper.findItems().get(2).toSelector(), { top: 0, left: 0 });
213212
await page.hoverElement(legendWrapper.findItems().get(2).toSelector());
214213

215214
await expect(page.getText(legendWrapper.findHighlightedItem().toSelector())).resolves.toBe('Chocolate');
@@ -239,7 +238,6 @@ describe('Legend', () => {
239238
'highlighted legend elements should be not be highlighted when user hovers away',
240239
setupTest(async page => {
241240
// Hover over second segment in the legend
242-
await page.elementScrollTo(legendWrapper.findItems().get(2).toSelector(), { top: 0, left: 0 });
243241
await page.hoverElement(legendWrapper.findItems().get(2).toSelector());
244242

245243
// Verify that no legend is highlighted

src/select/__integ__/select.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ test(
109109
const { height: actualDropdownHeight } = await page.getBoundingBox(optionsSelector);
110110
const availableDropdownHeight = smallestContainerHeight - triggerHeight;
111111
expect(actualDropdownHeight).toBeLessThan(availableDropdownHeight);
112-
const { top: containerScrollTop } = await page.getElementScroll('#smallest_container');
113-
expect(containerScrollTop).toBe(0);
114112
})
115113
);
116114

0 commit comments

Comments
 (0)