Merge branch '25_1' into 25_1_safe_size

Author: EugeniyKiyashko

e2e/testcafe-devextreme/helpers/themeUtils.ts

@@ -1,11 +1,11 @@
 import { isString } from 'devextreme/core/utils/type';
 import { changeTheme } from './changeTheme';
 
-const defaultThemeName = 'generic.light';
+const defaultThemeName = 'fluent.blue.light';
 
 export const getThemePostfix = (theme?: string): string => {
   const themeName = (theme ?? process.env.theme) ?? defaultThemeName;
-  return ` (${themeName.replace(/\./g, '-')})`;
+  return ` (${themeName})`;
 };
 
 export const isMaterial = (): boolean => process.env.theme === 'material.blue.light';
@@ -64,7 +64,7 @@ export async function testScreenshot(
     await compactCallBack?.();
 
     await t
-      .expect(await takeScreenshot(getScreenshotName(screenshotName, `${themeName}-compact`), element))
+      .expect(await takeScreenshot(getScreenshotName(screenshotName, `${themeName}.compact`), element))
       .ok();
   }
 

e2e/testcafe-devextreme/runner.ts

@@ -37,7 +37,7 @@ const TESTCAFE_CONFIG: Partial<TestCafeConfigurationOptions> = {
 
 const getCurrentTheme = async (t: TestController): Promise<string> => {
   // eslint-disable-next-line max-len
-  const currentTheme = await ClientFunction(() => (window as any).DevExpress.ui.themes.current()).with({ boundTestRun: t })();
+  const currentTheme = await ClientFunction(() => (window as any)?.DevExpress?.ui?.themes?.current()).with({ boundTestRun: t })();
 
   return currentTheme;
 };
@@ -98,7 +98,7 @@ function setTestingPlatform(args: ParsedArgs): void {
 }
 
 function setTestingTheme(args: ParsedArgs): void {
-  process.env.theme = args.theme || 'generic.light';
+  process.env.theme = args.theme || 'fluent.blue.light';
 }
 
 function setShadowDom(args: ParsedArgs): void {
@@ -278,13 +278,11 @@ 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) || 'fluent.blue.light';
+            const newTheme = args.theme || 'fluent.blue.light';
 
-              if (currentTheme !== newTheme) {
-                await changeTheme(t, newTheme);
-              }
+            if (currentTheme !== newTheme) {
+              await changeTheme(t, newTheme);
             }
           },
           after: async (t: TestController) => {