Skip to content

Commit e0fc834

Browse files
EugeniyKiyashkoEugeniyKiyashko
committed
revert some changes
1 parent ee9742b commit e0fc834

10 files changed

Lines changed: 77 additions & 77 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
"editor.codeActionsOnSave": {
66
"source.fixAll.eslint": "explicit"
77
},
8-
"typescript.tsdk": "packages/devextreme/node_modules/typescript/lib",
9-
"testcafeTestRunner.workspaceRoot": "/Users/eugeniy/Documents/GitHub/DevExtreme/e2e/testcafe-devextreme/"
8+
"typescript.tsdk": "packages/devextreme/node_modules/typescript/lib"
109
}

‎e2e/testcafe-devextreme/runner.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ const TESTCAFE_CONFIG: Partial<TestCafeConfigurationOptions> = {
3333
};
3434

3535
const getCurrentTheme = async (t: TestController): Promise<string> => {
36-
const currentTheme = await ClientFunction(() => {
37-
return (window as any).DevExpress.ui.themes.current();
38-
}).with({ boundTestRun: t })();
36+
const currentTheme = await ClientFunction(() =>
37+
(window as any).DevExpress.ui.themes.current()
38+
).with({ boundTestRun: t })();
3939

40-
return currentTheme;
40+
return currentTheme;
4141
};
4242

4343
const changeTheme = async (t: TestController, themeName: string): Promise<void> => {
@@ -261,11 +261,13 @@ createTestCafe(TESTCAFE_CONFIG)
261261
await addShadowRootTree(t);
262262
}
263263

264-
265264
const currentTheme = await getCurrentTheme(t) || 'generic.light';
266265
const newTheme = args.theme || 'generic.light';
267-
268-
if (currentTheme !== newTheme) {
266+
267+
if (currentTheme !== newTheme
268+
&& !componentFolder.includes('dataGrid')
269+
&& !componentFolder.includes('cardView')
270+
) {
269271
await changeTheme(t, newTheme);
270272
}
271273
},

‎e2e/testcafe-devextreme/tests/dataGrid/sticky/common/stickyColumns.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,29 @@ safeSizeTest('The simulated scrollbar should display correctly when there are st
6161
Themes.fluentBlue,
6262
Themes.genericGreenMist,
6363
].forEach((theme) => {
64-
test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
64+
safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
6565
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
6666
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
67-
const dataRow = dataGrid.getDataRow(1);
67+
const headerCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(13);
6868

6969
await t.expect(dataGrid.isReady()).ok();
7070

71-
await t.hover(dataRow.element);
71+
await t.hover(headerCell.element);
7272

73-
await t.expect(dataRow.isHovered).ok();
73+
await t.expect(headerCell.isHovered()).ok();
7474

75-
await takeScreenshot(`datagrid_row_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
75+
await takeScreenshot(`datagrid_header_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
7676

7777
await t
7878
.expect(compareResults.isValid())
7979
.ok(compareResults.errorMessages());
80-
})
80+
}, [900, 800])
8181
.before(async () => {
8282
await changeTheme(theme);
8383
await createWidget('dxDataGrid', {
8484
dataSource: getData(20, 15),
8585
columnWidth: 100,
8686
columnAutoWidth: true,
87-
hoverStateEnabled: true,
8887
customizeColumns: (columns) => {
8988
columns[5].fixed = true;
9089
columns[5].fixedPosition = 'left';
@@ -103,29 +102,30 @@ safeSizeTest('The simulated scrollbar should display correctly when there are st
103102
await changeTheme(Themes.genericLight);
104103
});
105104

106-
safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
105+
test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
107106
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
108107
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
109-
const headerCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(13);
108+
const dataRow = dataGrid.getDataRow(1);
110109

111110
await t.expect(dataGrid.isReady()).ok();
112111

113-
await t.hover(headerCell.element);
112+
await t.hover(dataRow.element);
114113

115-
await t.expect(headerCell.isHovered()).ok();
114+
await t.expect(dataRow.isHovered).ok();
116115

117-
await takeScreenshot(`datagrid_header_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
116+
await takeScreenshot(`datagrid_row_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
118117

119118
await t
120119
.expect(compareResults.isValid())
121120
.ok(compareResults.errorMessages());
122-
}, [900, 800])
121+
})
123122
.before(async () => {
124123
await changeTheme(theme);
125124
await createWidget('dxDataGrid', {
126125
dataSource: getData(20, 15),
127126
columnWidth: 100,
128127
columnAutoWidth: true,
128+
hoverStateEnabled: true,
129129
customizeColumns: (columns) => {
130130
columns[5].fixed = true;
131131
columns[5].fixedPosition = 'left';

‎e2e/testcafe-devextreme/tests/editors/dateRangeBox/focus.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import DateRangeBox from 'devextreme-testcafe-models/dateRangeBox';
33
import url from '../../../helpers/getPageUrl';
44
import { createWidget } from '../../../helpers/createWidget';
55

6-
fixture`DateRangeBox focus state`
6+
fixture.disablePageReloads`DateRangeBox focus state`
77
.page(url(__dirname, '../../container.html'));
88

99
test('DateRangeBox & DateBoxes should have focus class if inputs are focused by tab', async (t) => {

‎e2e/testcafe-devextreme/tests/editors/numberBox/label.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fixture.disablePageReloads`NumberBox_Label`
1616
.page(url(__dirname, '../../container.html'));
1717

1818
stylingModes.forEach((stylingMode) => {
19-
test(`Label for dxNumberBox stylingMode=${stylingMode}`, async (t) => {
19+
test.meta({ unstable: true })(`Label for dxNumberBox stylingMode=${stylingMode}`, async (t) => {
2020
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
2121

2222
await testScreenshot(t, takeScreenshot, `NumberBox label with stylingMode=${stylingMode}.png`, { element: '#container' });

‎e2e/testcafe-devextreme/tests/navigation/list/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { isMaterialBased, isFluent, testScreenshot } from '../../../helpers/them
55
import url from '../../../helpers/getPageUrl';
66
import { createWidget } from '../../../helpers/createWidget';
77

8-
fixture`List`
8+
fixture.disablePageReloads`List`
99
.page(url(__dirname, '../../container.html'));
1010

1111
test('Should focus first item after changing selection mode (T811770)', async (t) => {

‎e2e/testcafe-devextreme/tests/navigation/list/focus.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { testScreenshot } from '../../../helpers/themeUtils';
44
import url from '../../../helpers/getPageUrl';
55
import { createWidget } from '../../../helpers/createWidget';
66

7-
fixture`List`
7+
fixture.disablePageReloads`List`
88
.page(url(__dirname, '../../container.html'));
99

1010
const LIST_ITEM_DELETE_BUTTON = 'dx-list-static-delete-button';

‎e2e/testcafe-devextreme/tests/navigation/toolbar/overflowMenu.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const types = ['danger', 'default', 'normal', 'success'];
1919
// eslint-disable-next-line @stylistic/max-len
2020
const states = [false] as any[]; // FOCUSED_STATE_CLASS, HOVER_STATE_CLASS, `${FOCUSED_STATE_CLASS} ${ACTIVE_STATE_CLASS}`
2121

22-
fixture`Toolbar_OverflowMenu`
22+
fixture.disablePageReloads`Toolbar_OverflowMenu`
2323
.page(url(__dirname, '../../container.html'));
2424

2525
test('Drop down button should lost hover and active state', async (t) => {

‎e2e/testcafe-devextreme/tests/pagination/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Pagination from 'devextreme-testcafe-models/pagination';
22
import url from '../../helpers/getPageUrl';
33
import { createWidget } from '../../helpers/createWidget';
44

5-
fixture`Pagination Base Properties`
5+
fixture.disablePageReloads`Pagination Base Properties`
66
.page(url(__dirname, '../container.html'));
77

88
test('Pagination visibile property', async (t) => {

‎e2e/testcafe-devextreme/tests/treeList/stickyColumns/stickyColumns.ts‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@ fixture.disablePageReloads`Sticky columns - Drag and Drop`
1313
.page(url(__dirname, '../../container.html'));
1414

1515
[Themes.genericLight, Themes.materialBlue, Themes.fluentBlue].forEach((theme) => {
16-
test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
16+
safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
1717
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
1818
const treeList = new TreeList(TREE_LIST_SELECTOR);
19-
const dataRow = treeList.getDataRow(1);
19+
const headerCell = treeList.getHeaders().getHeaderRow(0).getHeaderCell(13);
2020

2121
await t.expect(treeList.isReady()).ok();
2222

23-
await t.hover(dataRow.element);
23+
await t.hover(headerCell.element);
2424

25-
await t.expect(dataRow.isHovered).ok();
25+
await t.expect(headerCell.isHovered()).ok();
2626

27-
await takeScreenshot(`treelist_row_hover_with_fixed_columns_(${theme}).png`, treeList.element);
27+
await takeScreenshot(`treelist_header_hover_with_fixed_columns_(${theme}).png`, treeList.element);
2828

2929
await t
3030
.expect(compareResults.isValid())
3131
.ok(compareResults.errorMessages());
32-
}).before(async () => {
32+
}, [900, 800])
33+
.before(async () => {
3334
await changeTheme(theme);
3435
await createWidget('dxTreeList', {
3536
dataSource: new Array(20).fill(null).map((_, index) => {
@@ -51,7 +52,6 @@ fixture.disablePageReloads`Sticky columns - Drag and Drop`
5152
width: 850,
5253
autoExpandAll: true,
5354
columnAutoWidth: true,
54-
hoverStateEnabled: true,
5555
customizeColumns(columns) {
5656
columns[5].fixed = true;
5757
columns[6].fixed = true;
@@ -68,58 +68,57 @@ fixture.disablePageReloads`Sticky columns - Drag and Drop`
6868
await changeTheme(Themes.genericLight);
6969
});
7070

71-
safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
71+
test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
7272
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
7373
const treeList = new TreeList(TREE_LIST_SELECTOR);
74-
const headerCell = treeList.getHeaders().getHeaderRow(0).getHeaderCell(13);
74+
const dataRow = treeList.getDataRow(1);
7575

7676
await t.expect(treeList.isReady()).ok();
7777

78-
await t.hover(headerCell.element);
78+
await t.hover(dataRow.element);
7979

80-
await t.expect(headerCell.isHovered()).ok();
80+
await t.expect(dataRow.isHovered).ok();
8181

82-
await takeScreenshot(`treelist_header_hover_with_fixed_columns_(${theme}).png`, treeList.element);
82+
await takeScreenshot(`treelist_row_hover_with_fixed_columns_(${theme}).png`, treeList.element);
8383

8484
await t
8585
.expect(compareResults.isValid())
8686
.ok(compareResults.errorMessages());
87-
}, [900, 800])
88-
.before(async () => {
89-
await changeTheme(theme);
90-
await createWidget('dxTreeList', {
91-
dataSource: new Array(20).fill(null).map((_, index) => {
92-
const item = {
93-
id: index + 1,
94-
parentId: index % 5,
95-
};
96-
97-
for (let i = 0; i < 13; i += 1) {
98-
item[`field${i}`] = `test ${i} ${index + 2}`;
99-
}
100-
101-
return item;
102-
}),
103-
keyExpr: 'id',
104-
columnFixing: {
105-
enabled: true,
106-
},
107-
width: 850,
108-
autoExpandAll: true,
109-
columnAutoWidth: true,
110-
customizeColumns(columns) {
111-
columns[5].fixed = true;
112-
columns[6].fixed = true;
113-
114-
columns[8].fixed = true;
115-
columns[8].fixedPosition = 'right';
116-
columns[9].fixed = true;
117-
columns[9].fixedPosition = 'right';
118-
},
119-
});
120-
})
121-
.after(async (t) => {
122-
await t.hover(Selector('body'));
123-
await changeTheme(Themes.genericLight);
87+
}).before(async () => {
88+
await changeTheme(theme);
89+
await createWidget('dxTreeList', {
90+
dataSource: new Array(20).fill(null).map((_, index) => {
91+
const item = {
92+
id: index + 1,
93+
parentId: index % 5,
94+
};
95+
96+
for (let i = 0; i < 13; i += 1) {
97+
item[`field${i}`] = `test ${i} ${index + 2}`;
98+
}
99+
100+
return item;
101+
}),
102+
keyExpr: 'id',
103+
columnFixing: {
104+
enabled: true,
105+
},
106+
width: 850,
107+
autoExpandAll: true,
108+
columnAutoWidth: true,
109+
hoverStateEnabled: true,
110+
customizeColumns(columns) {
111+
columns[5].fixed = true;
112+
columns[6].fixed = true;
113+
114+
columns[8].fixed = true;
115+
columns[8].fixedPosition = 'right';
116+
columns[9].fixed = true;
117+
columns[9].fixedPosition = 'right';
118+
},
124119
});
120+
}).after(async (t) => {
121+
await t.hover(Selector('body'));
122+
await changeTheme(Themes.genericLight);
123+
});
125124
});

0 commit comments

Comments
 (0)