Skip to content

Commit 8da8444

Browse files
ajivanyandevajivanyandev
authored
Merge branch '25_2' into fix/undefined-element-offset
2 parents 3a62da1 + e479ab2 commit 8da8444

90 files changed

Lines changed: 193 additions & 95 deletions

File tree

Some content is hidden

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

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
2-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
32
import HeaderFilter from 'devextreme-testcafe-models/dataGrid/headers/headerFilter';
43
import { a11yCheck } from '../../../helpers/accessibility/utils';
54
import url from '../../../helpers/getPageUrl';
@@ -184,16 +183,16 @@ test('Grouping and Summary', async (t) => {
184183

185184
test('Filter row - filter menu', async (t) => {
186185
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
187-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
186+
const filterCell = dataGrid.getFilterCell(0);
188187

189188
await t
190189
.expect(dataGrid.isReady())
191190
.ok();
192191

193-
await t.click(filterEditor.menuButton);
192+
await t.click(filterCell.menuButton);
194193

195194
await t
196-
.expect(filterEditor.menu.isOpened)
195+
.expect(filterCell.menu.isOpened)
197196
.ok();
198197

199198
await a11yCheck(t, {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
22
import HeaderFilter from 'devextreme-testcafe-models/dataGrid/headers/headerFilter';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
3+
import TextBox from 'devextreme-testcafe-models/textBox';
44
import { a11yCheck } from '../../../helpers/accessibility/utils';
55
import url from '../../../helpers/getPageUrl';
66
import { createWidget } from '../../../helpers/createWidget';
@@ -73,7 +73,7 @@ test('Accessibility: DataGrid general status should contains correct text after
7373
test('Accessibility: DataGrid general status should contains correct text after filter row interaction', async (t) => {
7474
const expectedStatusText = 'Data grid with 1 rows and 2 columns';
7575
const dataGrid = new DataGrid('#container');
76-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
76+
const filterEditor = dataGrid.getFilterEditor(0, TextBox);
7777

7878
const applyFilterBtn = dataGrid.getHeaderPanel().getApplyFilterButton();
7979
await t.typeText(filterEditor.input(), 'A')

‎e2e/testcafe-devextreme/tests/accessibility/treeList/status.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import HeaderFilter from 'devextreme-testcafe-models/dataGrid/headers/headerFilter';
2-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
2+
import TextBox from 'devextreme-testcafe-models/textBox';
33
import TreeList from 'devextreme-testcafe-models/treeList';
44
import { a11yCheck } from '../../../helpers/accessibility/utils';
55
import url from '../../../helpers/getPageUrl';
@@ -99,7 +99,7 @@ test('Accessibility: TreeList general status should contains correct text after
9999
test('Accessibility: TreeList general status should contains correct text after filter row interaction', async (t) => {
100100
const expectedStatusText = 'Tree list with 2 rows and 2 columns';
101101
const treeList = new TreeList('#container');
102-
const filterEditor = treeList.getFilterEditor(0, FilterTextBox);
102+
const filterEditor = treeList.getFilterEditor(0, TextBox);
103103

104104
const applyFilterBtn = treeList.getHeaderPanel().getApplyFilterButton();
105105
await t.typeText(filterEditor.input(), 'B')

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import DataGrid from 'devextreme-testcafe-models/dataGrid';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
43
import HeaderFilter from 'devextreme-testcafe-models/dataGrid/headers/headerFilter';
54
import url from '../../../../helpers/getPageUrl';
65
import { createWidget } from '../../../../helpers/createWidget';
@@ -182,16 +181,16 @@ test('Grouping and Summary', async (t) => {
182181

183182
test('Filter row - filter menu', async (t) => {
184183
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
185-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
184+
const filterCell = dataGrid.getFilterCell(0);
186185

187186
await t
188187
.expect(dataGrid.isReady())
189188
.ok();
190189

191-
await t.click(filterEditor.menuButton);
190+
await t.click(filterCell.menuButton);
192191

193192
await t
194-
.expect(filterEditor.menu.isOpened)
193+
.expect(filterCell.menu.isOpened)
195194
.ok();
196195

197196
await screenshotCheck(t, 'filter-row-menu');

‎e2e/testcafe-devextreme/tests/dataGrid/common/accessibility/contrast.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import DataGrid from 'devextreme-testcafe-models/dataGrid';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
43
import url from '../../../../helpers/getPageUrl';
54
import { createWidget } from '../../../../helpers/createWidget';
65
import { getData } from '../../helpers/generateDataSourceData';
@@ -15,9 +14,9 @@ fixture.disablePageReloads`DataGrid - contrast`
1514
// visual: material.blue.light
1615
test('DataGrid - Contrast between icons in the Filter Row menu and their background doesn\'t comply with WCAG accessibility standards', async (t) => {
1716
const dataGrid = new DataGrid('#container');
18-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
19-
const searchButton = filterEditor.menuButton;
20-
const filterMenu = filterEditor.menu;
17+
const filterCell = dataGrid.getFilterCell(0);
18+
const searchButton = filterCell.menuButton;
19+
const filterMenu = filterCell.menu;
2120
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2221

2322
await t
@@ -63,7 +62,7 @@ test('DataGrid - Filter icon should remain visible when it\'s focused', async (t
6362
.element;
6463

6564
await t
66-
.click(dataGrid.getFilterCell(0))
65+
.click(dataGrid.getFilterCell(0).element)
6766
.pressKey('tab')
6867
.expect(searchIconContainer.focused)
6968
.ok();

‎e2e/testcafe-devextreme/tests/dataGrid/common/filterPanel/functional.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
22
import Popup from 'devextreme-testcafe-models/popup';
33
import FilterBuilder from 'devextreme-testcafe-models/filterBuilder';
4-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
54

65
import url from '../../../../helpers/getPageUrl';
76
import { createWidget } from '../../../../helpers/createWidget';
@@ -52,7 +51,7 @@ test('Proper handle custom filter operations for dates with non-date values', as
5251
.expect(filterPanel.getFilterText().element.innerText)
5352
.eql('[Order Date] Weekends');
5453

55-
const dateFilterCell = dataGrid.getFilterEditor(1, FilterTextBox);
54+
const dateFilterCell = dataGrid.getFilterCell(1);
5655

5756
await t
5857
.click(dateFilterCell.menuButton)

‎e2e/testcafe-devextreme/tests/dataGrid/common/filterRow/T1163100_changeFIlterIcon.visual_matrix.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import DataGrid from 'devextreme-testcafe-models/dataGrid';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
43
import { createWidget } from '../../../../helpers/createWidget';
54
import url from '../../../../helpers/getPageUrl';
65
import { testScreenshot } from '../../../../helpers/themeUtils';
@@ -36,10 +35,10 @@ const generateTestData = (rowCount: number) => new Array(rowCount)
3635
const dataGrid = new DataGrid(GRID_SELECTOR);
3736

3837
for (let columnIdx = 0; columnIdx < 4; columnIdx += 1) {
39-
const filterMenu = dataGrid.getFilterEditor(columnIdx, FilterTextBox);
38+
const filterCell = dataGrid.getFilterCell(columnIdx);
4039
await t
41-
.click(filterMenu.menuButton())
42-
.click(filterMenu.menu.getItemByText('Starts with'));
40+
.click(filterCell.menuButton)
41+
.click(filterCell.menu.getItemByText('Starts with'));
4342
}
4443

4544
await testScreenshot(

‎e2e/testcafe-devextreme/tests/dataGrid/common/filterRow/functional.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
2-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
2+
import TextBox from 'devextreme-testcafe-models/textBox';
33
import url from '../../../../helpers/getPageUrl';
44
import { createWidget } from '../../../../helpers/createWidget';
55
import { getData } from '../../helpers/generateDataSourceData';
@@ -9,7 +9,7 @@ fixture`FilterRow`
99

1010
test('Filter should reset if the filter row editor text is cleared (T1257261)', async (t) => {
1111
const dataGrid = new DataGrid('#container');
12-
const filterEditor = dataGrid.getFilterEditor(1, FilterTextBox);
12+
const filterEditor = dataGrid.getFilterEditor(1, TextBox);
1313
const filterPanelText = dataGrid.getFilterPanel().getFilterText();
1414

1515
await t
@@ -53,7 +53,7 @@ test('Filter should reset if the filter row editor text is cleared (T1257261)',
5353
// T1267481
5454
test('Filter Row\'s Reset button does not work after a custom filter is set in Filter Builder', async (t) => {
5555
const dataGrid = new DataGrid('#container');
56-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
56+
const filterCell = dataGrid.getFilterCell(0);
5757

5858
await dataGrid.isReady();
5959

@@ -62,8 +62,8 @@ test('Filter Row\'s Reset button does not work after a custom filter is set in F
6262
.eql(0);
6363

6464
await t
65-
.click(filterEditor.menuButton)
66-
.click(filterEditor.menu.getItemByText('Reset'));
65+
.click(filterCell.menuButton)
66+
.click(filterCell.menu.getItemByText('Reset'));
6767

6868
await t
6969
.expect(dataGrid.dataRows.count)
@@ -104,11 +104,11 @@ test('Filter Row\'s Reset button does not work after a custom filter is set in F
104104
// T1290381
105105
test('DataGrid - filter row\'s search-box\'s aria-label should be customizable via localization', async (t) => {
106106
const dataGrid = new DataGrid('#container');
107-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
107+
const filterCell = dataGrid.getFilterCell(0);
108108

109109
await dataGrid.isReady();
110110

111-
const ariaLabel = await filterEditor.menuButton.getAttribute('aria-label');
111+
const ariaLabel = await filterCell.menuButton.getAttribute('aria-label');
112112

113113
await t
114114
.expect(ariaLabel)
@@ -135,27 +135,27 @@ test('DataGrid - filter row\'s search-box\'s aria-label should be customizable v
135135

136136
test('DataGrid - NVDA reads filter menu items as "Search box 1 of 8" (T1290386)', async (t) => {
137137
const dataGrid = new DataGrid('#container');
138-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
138+
const filterCell = dataGrid.getFilterCell(0);
139139

140140
await dataGrid.isReady();
141141

142142
await t
143-
.expect(filterEditor.menuButton.getAttribute('aria-label'))
143+
.expect(filterCell.menuButton.getAttribute('aria-label'))
144144
.eql('Search box');
145145

146146
await t
147-
.click(filterEditor.menuButton);
147+
.click(filterCell.menuButton);
148148

149-
const itemCount = await filterEditor.menu.getItemCount();
149+
const itemCount = await filterCell.menu.getItemCount();
150150

151151
for (let i = 0; i < itemCount; i += 1) {
152-
const item = filterEditor.menu.getItemByIndex(i);
152+
const item = filterCell.menu.getItemByIndex(i);
153153
await t.expect(item.getAttribute('aria-label')).eql(null);
154154
}
155155

156156
await t
157-
.click(filterEditor.menu.getItemByText('Equals'))
158-
.expect(filterEditor.menuButton.getAttribute('aria-label'))
157+
.click(filterCell.menu.getItemByText('Equals'))
158+
.expect(filterCell.menuButton.getAttribute('aria-label'))
159159
.eql('Equals');
160160
}).before(async () => createWidget('dxDataGrid', {
161161
dataSource: getData(5, 1),
@@ -173,7 +173,7 @@ test('DataGrid - NVDA reads filter menu items as "Search box 1 of 8" (T1290386)'
173173
const expectedFocusedElement = grouped ? dataGrid.getGroupRow(0) : dataGrid.getDataCell(0, 0);
174174

175175
await t
176-
.click(filterCell)
176+
.click(filterCell.element)
177177
.expect(dataGrid.getFilterRangeOverlay().exists)
178178
.ok('Filter range overlay is shown')
179179
.pressKey('tab')
@@ -209,7 +209,7 @@ test('DataGrid - filter range overlay in last column on Tab pressed moves focus
209209
const filterCell = dataGrid.getFilterCell(2);
210210

211211
await t
212-
.click(filterCell)
212+
.click(filterCell.element)
213213
.expect(dataGrid.getFilterRangeOverlay().exists)
214214
.ok('Filter range overlay is shown')
215215
.pressKey('tab')

‎e2e/testcafe-devextreme/tests/dataGrid/common/filterRow/visual.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
22
import DataGrid from 'devextreme-testcafe-models/dataGrid';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
3+
import TextBox from 'devextreme-testcafe-models/textBox';
44
import url from '../../../../helpers/getPageUrl';
55
import { createWidget } from '../../../../helpers/createWidget';
66
import { getNumberData } from '../../helpers/generateDataSourceData';
@@ -35,12 +35,12 @@ test.meta({
3535
test('FilterRow range overlay screenshot', async (t) => {
3636
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
3737
const dataGrid = new DataGrid('#container');
38-
const filterEditor = dataGrid.getFilterEditor(1, FilterTextBox);
38+
const filterCell = dataGrid.getFilterCell(1);
3939

4040
await t
41-
.click(filterEditor.menuButton);
41+
.click(filterCell.menuButton);
4242
await t
43-
.click(filterEditor.menu.getItemByText('Between'));
43+
.click(filterCell.menu.getItemByText('Between'));
4444
// act
4545
await testScreenshot(t, takeScreenshot, 'filter-row-overlay.png');
4646
await t
@@ -68,7 +68,7 @@ test('FilterRow range overlay screenshot', async (t) => {
6868
test('Focus overlay should be visible in filter row when focusedRowEnabled is enabled', async (t) => {
6969
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
7070
const dataGrid = new DataGrid('#container');
71-
const filterEditor = dataGrid.getFilterEditor(1, FilterTextBox);
71+
const filterEditor = dataGrid.getFilterEditor(1, TextBox);
7272

7373
await t
7474
.click(dataGrid.getDataCell(0, 0).element)
@@ -96,13 +96,13 @@ test('Focus overlay should be visible in filter row when focusedRowEnabled is en
9696
test('DataGrid - The `between` filter dropdown sticks to the viewport edge during horizontal scrolling (T1280071)', async (t) => {
9797
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
9898
const dataGrid = new DataGrid('#container');
99-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox);
99+
const filterCell = dataGrid.getFilterCell(0);
100100

101101
await dataGrid.isReady();
102102

103103
await t
104-
.click(filterEditor.menuButton)
105-
.click(filterEditor.menu.getItemByText('Between'));
104+
.click(filterCell.menuButton)
105+
.click(filterCell.menu.getItemByText('Between'));
106106

107107
await dataGrid.scrollBy(t, { x: 999 });
108108
await testScreenshot(t, takeScreenshot, 'filter-row-filter-range-hide-on-scroll.png');

‎e2e/testcafe-devextreme/tests/dataGrid/common/focus/focus.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import DataGrid from 'devextreme-testcafe-models/dataGrid';
22
import { ClientFunction } from 'testcafe';
3-
import FilterTextBox from 'devextreme-testcafe-models/dataGrid/editors/filterTextBox';
3+
import TextBox from 'devextreme-testcafe-models/textBox';
44
import { createWidget } from '../../../../helpers/createWidget';
55
import url from '../../../../helpers/getPageUrl';
66

@@ -152,7 +152,7 @@ test('Should remove dx-focused class on blur event from the cell', async (t) =>
152152

153153
test('DataGrid - FilterRow cell loses focus when focusedRowEnabled is true and editing is in batch mode (T1246926)', async (t) => {
154154
const dataGrid = new DataGrid('#container');
155-
const filterEditor = dataGrid.getFilterEditor(0, FilterTextBox).getInput();
155+
const filterEditor = dataGrid.getFilterEditor(0, TextBox).getInput();
156156

157157
await t
158158
.click(dataGrid.getDataCell(0, 0).element)

0 commit comments

Comments
 (0)