Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion e2e/testcafe-devextreme/tests/common/gantt/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import { Selector } from 'testcafe';
import { testScreenshot } from '../../../helpers/themeUtils';
import url from '../../../helpers/getPageUrl';
import { createWidget } from '../../../helpers/createWidget';
import { appendElementTo } from '../../../helpers/domUtils';
import { appendElementTo, insertStylesheetRulesToPage } from '../../../helpers/domUtils';
import { Themes } from '../../../helpers/themes';

const TOOLBAR_ITEM_BUTTON = '.dx-button';
const HIDDEN_SCROLLBAR_THUMB_STYLE = '.dx-gantt .dx-scrollable-scroll { visibility: hidden !important; }';

fixture`Gantt`
.page(url(__dirname, '../../container-extended.html'));
Expand Down Expand Up @@ -128,6 +129,7 @@ test.meta({ themes: [Themes.materialBlue] })('Gantt - show resources button shou
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => {
await insertStylesheetRulesToPage(HIDDEN_SCROLLBAR_THUMB_STYLE);
const id = `${new Guid()}`;
await appendElementTo('#container', 'div', id, {});
await createWidget('dxGantt', {
Expand All @@ -149,6 +151,7 @@ test('Gantt - show dependencies button should not have focus state (T1264485)',
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => {
await insertStylesheetRulesToPage(HIDDEN_SCROLLBAR_THUMB_STYLE);
const id = `${new Guid()}`;
await appendElementTo('#container', 'div', id, {});
await createWidget('dxGantt', {
Expand Down
10 changes: 9 additions & 1 deletion e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2063,7 +2063,15 @@ test('Last group should not disappear after collapsing another subgroup with vir
// act
await dataGrid.scrollTo(t, { top: 200 });
await dataGrid.scrollTo(t, { top: 600 });
await t.expect(dataGrid.isReady()).ok();
await t
.expect(dataGrid.isReady())
.ok()
.expect(dataGrid.isVirtualRowIntersectViewport())
.notOk()
.expect(dataGrid.getFixedDataCell(12, 0).element.textContent)
.eql('12')
.expect(dataGrid.getFixedDataCell(19, 0).element.textContent)
.eql('19');

// assert
await testScreenshot(t, takeScreenshot, `grid-${scrollingMode}-scrolling-T1152498.png`, { element: '#container' });
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import Scrollable from 'devextreme-testcafe-models/scrollView/internal/scrollabl
import { testScreenshot } from '../../../helpers/themeUtils';
import url from '../../../helpers/getPageUrl';
import { createWidget } from '../../../helpers/createWidget';
import { appendElementTo } from '../../../helpers/domUtils';
import { appendElementTo, insertStylesheetRulesToPage } from '../../../helpers/domUtils';

fixture.disablePageReloads`Scrollable_visibility_integration`
.page(url(__dirname, '../../container.html'));
type ScrollableDirection = 'both' | 'horizontal' | 'vertical';

const PINNED_SCROLLBAR_THUMB_STYLE = '#scrollable .dx-scrollable-scroll { opacity: 1 !important; transition: none !important; }';

(['both'] as ScrollableDirection[]).forEach((direction) => {
[false, true].forEach((useNative) => {
[false, true].forEach((rtlEnabled) => {
Expand Down Expand Up @@ -42,6 +44,10 @@ type ScrollableDirection = 'both' | 'horizontal' | 'vertical';
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => {
if (useNative && useSimulatedScrollbar) {
await insertStylesheetRulesToPage(PINNED_SCROLLBAR_THUMB_STYLE);
}

await appendElementTo('#container', 'div', 'scrollable');

await appendElementTo('#scrollable', 'div', 'content', {
Expand Down
Loading