Skip to content

Commit b555ae1

Browse files
EugeniyKiyashkoEugeniyKiyashko
committed
revert some changes
1 parent 74a3f38 commit b555ae1

13 files changed

Lines changed: 273 additions & 338 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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ const TESTCAFE_CONFIG: Partial<TestCafeConfigurationOptions> = {
3232
};
3333

3434
const getCurrentTheme = async (t: TestController): Promise<string> => {
35-
const currentTheme = await ClientFunction(() => {
36-
return (window as any).DevExpress.ui.themes.current();
37-
}).with({ boundTestRun: t })();
35+
// eslint-disable-next-line @stylistic/max-len
36+
const currentTheme = await ClientFunction(() => (window as any).DevExpress.ui.themes.current()).with({ boundTestRun: t })();
3837

39-
return currentTheme;
38+
return currentTheme;
4039
};
4140

4241
const changeTheme = async (t: TestController, themeName: string): Promise<void> => {
@@ -245,7 +244,7 @@ createTestCafe(TESTCAFE_CONFIG)
245244
}
246245

247246
const runOptions: RunOptions = {
248-
quarantineMode: { successThreshold: 1, attemptLimit: 10 },
247+
quarantineMode: { successThreshold: 1, attemptLimit: 5 },
249248
disableNativeAutomation: true,
250249
// @ts-expect-error ts-error
251250
hooks: {
@@ -260,12 +259,13 @@ createTestCafe(TESTCAFE_CONFIG)
260259
await addShadowRootTree(t);
261260
}
262261

262+
if (!componentFolder.includes('dataGrid')) {
263+
const currentTheme = await getCurrentTheme(t) || 'generic.light';
264+
const newTheme = args.theme || 'generic.light';
263265

264-
const currentTheme = await getCurrentTheme(t) || 'generic.light';
265-
const newTheme = args.theme || 'generic.light';
266-
267-
if (currentTheme !== newTheme) {
268-
await changeTheme(t, newTheme);
266+
if (currentTheme !== newTheme) {
267+
await changeTheme(t, newTheme);
268+
}
269269
}
270270
},
271271
after: async (t: TestController) => {

‎e2e/testcafe-devextreme/tests/cardView/headerPanel/visual.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ test(
194194
width: 600,
195195
}));
196196

197-
test('render with horizontal scroll', async (t) => {
197+
test.meta({ unstable: true })('render with horizontal scroll', async (t) => {
198198
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
199199
const cardView = new CardView(CARD_VIEW_SELECTOR);
200200
const firstItem = cardView.getHeaderPanel().getHeaderItem(0);

‎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/editors/overlays/dialog.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import url from '../../../helpers/getPageUrl';
66

77
const DX_DIALOG_CLASS = 'dx-dialog';
88

9-
fixture`Dialog`
9+
fixture.disablePageReloads`Dialog`
1010
.page(url(__dirname, '../../container.html'));
1111

1212
[

‎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';

0 commit comments

Comments
 (0)