update etalons

Author: EugeniyKiyashko

.vscode/settings.json

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

e2e/testcafe-devextreme/helpers/clearPage.js

@@ -1,10 +1,10 @@
 const testCafe = require('testcafe');
 
 module.exports = {
-    clearTestPage: async function() {
+    clearTestPage: async function(testController) {
         const shadowDom = process.env.shadowDom === 'true';
 
-        await testCafe.ClientFunction(() => {
+        const clearTestPageFn = testCafe.ClientFunction(() => {
             const widgetSelector = '.dx-widget';
             const $elements = $(widgetSelector)
                 .filter((_, element) => $(element).parents(widgetSelector).length === 0);
@@ -45,6 +45,8 @@ module.exports = {
             dependencies: {
                 shadowDom,
             }
-        })();
+        });
+
+        await clearTestPageFn.with({ boundTestRun: testController })();
     }
 };

e2e/testcafe-devextreme/runner.ts

@@ -31,6 +31,14 @@ const TESTCAFE_CONFIG: Partial<TestCafeConfigurationOptions> = {
   port2: 1438,
 };
 
+const getCurrentTheme = async (t: TestController): Promise<string> => {
+    const currentTheme = await ClientFunction(() => {
+        return (window as any).DevExpress.ui.themes.current();
+    }).with({ boundTestRun: t })();
+
+    return currentTheme;
+};
+
 const changeTheme = async (t: TestController, themeName: string): Promise<void> => {
   const changeThemeClientFn = ClientFunction(() => new Promise<void>((resolve) => {
     (window as any).DevExpress.ui.themes.ready(resolve);
@@ -252,12 +260,16 @@ createTestCafe(TESTCAFE_CONFIG)
               await addShadowRootTree(t);
             }
 
-            if (args.theme) {
-              await changeTheme(t, args.theme);
+
+            const currentTheme = await getCurrentTheme(t) || 'generic.light';
+            const newTheme = args.theme || 'generic.light';
+            
+            if (currentTheme !== newTheme) {
+              await changeTheme(t, newTheme);
             }
           },
-          after: async () => {
-            await testPageUtils.clearTestPage();
+          after: async (t: TestController) => {
+            await testPageUtils.clearTestPage(t);
           },
         },
       },