revert some changes

Author: EugeniyKiyashko

.vscode/settings.json

@@ -5,6 +5,5 @@
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": "explicit"
     },
-    "typescript.tsdk": "packages/devextreme/node_modules/typescript/lib",
-    "testcafeTestRunner.workspaceRoot": "/Users/eugeniy/Documents/GitHub/DevExtreme/e2e/testcafe-devextreme/"
+    "typescript.tsdk": "packages/devextreme/node_modules/typescript/lib"
 }

e2e/testcafe-devextreme/runner.ts

@@ -32,11 +32,10 @@ const TESTCAFE_CONFIG: Partial<TestCafeConfigurationOptions> = {
 };
 
 const getCurrentTheme = async (t: TestController): Promise<string> => {
-    const currentTheme = await ClientFunction(() => {
-        return (window as any).DevExpress.ui.themes.current();
-    }).with({ boundTestRun: t })();
+  // eslint-disable-next-line max-len
+  const currentTheme = await ClientFunction(() => (window as any).DevExpress.ui.themes.current()).with({ boundTestRun: t })();
 
-    return currentTheme;
+  return currentTheme;
 };
 
 const changeTheme = async (t: TestController, themeName: string): Promise<void> => {
@@ -245,7 +244,7 @@ createTestCafe(TESTCAFE_CONFIG)
     }
 
     const runOptions: RunOptions = {
-      quarantineMode: { successThreshold: 1, attemptLimit: 10 },
+      quarantineMode: { successThreshold: 1, attemptLimit: 5 },
       disableNativeAutomation: true,
       // @ts-expect-error ts-error
       hooks: {
@@ -260,12 +259,13 @@ createTestCafe(TESTCAFE_CONFIG)
               await addShadowRootTree(t);
             }
 
+            if (!componentFolder.includes('dataGrid')) {
+              const currentTheme = await getCurrentTheme(t) || 'generic.light';
+              const newTheme = args.theme || 'generic.light';
 
-            const currentTheme = await getCurrentTheme(t) || 'generic.light';
-            const newTheme = args.theme || 'generic.light';
-            
-            if (currentTheme !== newTheme) {
-              await changeTheme(t, newTheme);
+              if (currentTheme !== newTheme) {
+                await changeTheme(t, newTheme);
+              }
             }
           },
           after: async (t: TestController) => {

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

@@ -194,7 +194,7 @@ test(
   width: 600,
 }));
 
-test('render with horizontal scroll', async (t) => {
+test.meta({ unstable: true })('render with horizontal scroll', async (t) => {
   const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
   const cardView = new CardView(CARD_VIEW_SELECTOR);
   const firstItem = cardView.getHeaderPanel().getHeaderItem(0);

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/appearance.ts

@@ -28,7 +28,7 @@ fixture.disablePageReloads`FixedColumns - appearance`
   ([theme, showRowLines]) => {
     // T1268664
     const showRowLinesState = `showRowLines=${showRowLines ? 'true' : 'false'}`;
-    test(`Row height for selected, focus and edit state should not differ from the default one if ${showRowLinesState}`, async (t) => {
+    test.meta({ unstable: true })(`Row height for selected, focus and edit state should not differ from the default one if ${showRowLinesState}`, async (t) => {
       const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
 
       const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/datagrid_default_state_with_showRowLines=true_(material.blue.light).png

@@ -61,30 +61,29 @@ safeSizeTest('The simulated scrollbar should display correctly when there are st
   Themes.fluentBlue,
   Themes.genericGreenMist,
 ].forEach((theme) => {
-  test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
+  safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
     const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
     const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
-    const dataRow = dataGrid.getDataRow(1);
+    const headerCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(13);
 
     await t.expect(dataGrid.isReady()).ok();
 
-    await t.hover(dataRow.element);
+    await t.hover(headerCell.element);
 
-    await t.expect(dataRow.isHovered).ok();
+    await t.expect(headerCell.isHovered()).ok();
 
-    await takeScreenshot(`datagrid_row_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
+    await takeScreenshot(`datagrid_header_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
 
     await t
       .expect(compareResults.isValid())
       .ok(compareResults.errorMessages());
-  })
+  }, [900, 800])
     .before(async () => {
       await changeTheme(theme);
       await createWidget('dxDataGrid', {
         dataSource: getData(20, 15),
         columnWidth: 100,
         columnAutoWidth: true,
-        hoverStateEnabled: true,
         customizeColumns: (columns) => {
           columns[5].fixed = true;
           columns[5].fixedPosition = 'left';
@@ -103,29 +102,30 @@ safeSizeTest('The simulated scrollbar should display correctly when there are st
       await changeTheme(Themes.genericLight);
     });
 
-  safeSizeTest(`Header hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
+  test.meta({ unstable: true })(`Row hover should display correctly when there are fixed columns (${theme} theme)`, async (t) => {
     const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
     const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
-    const headerCell = dataGrid.getHeaders().getHeaderRow(0).getHeaderCell(13);
+    const dataRow = dataGrid.getDataRow(1);
 
     await t.expect(dataGrid.isReady()).ok();
 
-    await t.hover(headerCell.element);
+    await t.hover(dataRow.element);
 
-    await t.expect(headerCell.isHovered()).ok();
+    await t.expect(dataRow.isHovered).ok();
 
-    await takeScreenshot(`datagrid_header_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
+    await takeScreenshot(`datagrid_row_hover_with_fixed_columns_(${theme}).png`, dataGrid.element);
 
     await t
       .expect(compareResults.isValid())
       .ok(compareResults.errorMessages());
-  }, [900, 800])
+  })
     .before(async () => {
       await changeTheme(theme);
       await createWidget('dxDataGrid', {
         dataSource: getData(20, 15),
         columnWidth: 100,
         columnAutoWidth: true,
+        hoverStateEnabled: true,
         customizeColumns: (columns) => {
           columns[5].fixed = true;
           columns[5].fixedPosition = 'left';