Skip to content

Commit 801feaa

Browse files
Merge branch '25_2' into 25_2_ng_nested_fix
2 parents 7313e23 + b444091 commit 801feaa

File tree

202 files changed

+1476
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+1476
-737
lines changed

e2e/testcafe-devextreme/tests/dataGrid/common/accessibility/status.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ test('Accessibility: DataGrid general status should contains correct text after
7575
const dataGrid = new DataGrid('#container');
7676
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
7777

78-
// await t.debug();
79-
8078
const applyFilterBtn = dataGrid.getHeaderPanel().getApplyFilterButton();
8179
await t.typeText(filterEditor.input(), 'A')
8280
.click(applyFilterBtn);
93.5 KB
64.3 KB
112 KB

e2e/testcafe-devextreme/tests/dataGrid/common/virtualColumns.ts

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,96 @@ test('Columns should be rendered correctly after reinit of columns controller',
296296
},
297297
}));
298298

299+
test('Columns reordering should work with virtual columns', async (t) => {
300+
const dataGrid = new DataGrid('#container');
301+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
302+
303+
await dataGrid.scrollTo(t, { x: 100000 });
304+
305+
await t.drag(
306+
dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(499).element,
307+
-110,
308+
0,
309+
);
310+
311+
await t
312+
.expect(await takeScreenshot('data-grid__virtual-columns__reoder.png', dataGrid.element))
313+
.ok()
314+
.expect(compareResults.isValid())
315+
.ok(compareResults.errorMessages());
316+
}).before(async () => createWidget('dxDataGrid', {
317+
allowColumnReordering: true,
318+
height: 440,
319+
dataSource: generateData(150, 500),
320+
columns: generateColumns(500),
321+
columnWidth: 100,
322+
scrolling: {
323+
columnRenderingMode: 'virtual',
324+
},
325+
}));
326+
327+
test('Grouping should work with virtual columns', async (t) => {
328+
const dataGrid = new DataGrid('#container');
329+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
330+
331+
await dataGrid.scrollTo(t, { x: 100000 });
332+
333+
await t.dragToElement(
334+
dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(499).element,
335+
dataGrid.getGroupPanel().element,
336+
);
337+
338+
await t
339+
.expect(await takeScreenshot('data-grid__virtual-columns__grouping.png', dataGrid.element))
340+
.ok()
341+
.expect(compareResults.isValid())
342+
.ok(compareResults.errorMessages());
343+
}).before(async () => createWidget('dxDataGrid', {
344+
height: 440,
345+
groupPanel: {
346+
visible: true,
347+
},
348+
dataSource: generateData(150, 500),
349+
columns: generateColumns(500),
350+
columnWidth: 100,
351+
scrolling: {
352+
columnRenderingMode: 'virtual',
353+
},
354+
}));
355+
356+
test('Column chooser should work with virtual columns', async (t) => {
357+
const dataGrid = new DataGrid('#container');
358+
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
359+
360+
await dataGrid.scrollTo(t, { x: 100000 });
361+
362+
await t.click(dataGrid.getColumnChooserButton());
363+
await t.expect(
364+
dataGrid.getColumnChooser().isOpened,
365+
).ok();
366+
367+
await t.dragToElement(
368+
dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(499).element,
369+
dataGrid.getColumnChooser().content,
370+
);
371+
await t
372+
.expect(await takeScreenshot('data-grid__virtual-columns__column-chooser.png', dataGrid.element))
373+
.ok()
374+
.expect(compareResults.isValid())
375+
.ok(compareResults.errorMessages());
376+
}).before(async () => createWidget('dxDataGrid', {
377+
height: 440,
378+
columnChooser: {
379+
enabled: true,
380+
},
381+
dataSource: generateData(150, 500),
382+
columns: generateColumns(500),
383+
columnWidth: 100,
384+
scrolling: {
385+
columnRenderingMode: 'virtual',
386+
},
387+
}));
388+
299389
test('Group row should have right colspan with summary, virtual columns and fixed columns (T1221369)', async (t) => {
300390
const grid = new DataGrid('#container');
301391
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

e2e/testcafe-devextreme/tests/form/etalons/The validation message overlay position auto for DateRangeBox after opening (fluent-blue-light).png renamed to e2e/testcafe-devextreme/tests/editors/dateRangeBox/etalons/The validation message overlay position auto for DateRangeBox after opening (fluent-blue-light).png

File renamed without changes.

e2e/testcafe-devextreme/tests/form/etalons/The validation message overlay position auto for DateRangeBox after opening (fluent-blue-light-compact).png renamed to e2e/testcafe-devextreme/tests/editors/dateRangeBox/etalons/The validation message overlay position auto for DateRangeBox after opening (fluent-blue-light-compact).png

File renamed without changes.

e2e/testcafe-devextreme/tests/form/etalons/The validation message overlay position auto for DateRangeBox after opening (generic-light).png renamed to e2e/testcafe-devextreme/tests/editors/dateRangeBox/etalons/The validation message overlay position auto for DateRangeBox after opening (generic-light).png

File renamed without changes.

e2e/testcafe-devextreme/tests/form/etalons/The validation message overlay position auto for DateRangeBox after opening (generic-light-compact).png renamed to e2e/testcafe-devextreme/tests/editors/dateRangeBox/etalons/The validation message overlay position auto for DateRangeBox after opening (generic-light-compact).png

File renamed without changes.

e2e/testcafe-devextreme/tests/form/etalons/The validation message overlay position auto for DateRangeBox after opening (material-blue-light).png renamed to e2e/testcafe-devextreme/tests/editors/dateRangeBox/etalons/The validation message overlay position auto for DateRangeBox after opening (material-blue-light).png

File renamed without changes.

0 commit comments

Comments
 (0)