Merge branch '25_2' into 25_2_update_testcafe

Author: EugeniyKiyashko

.github/workflows/qunit_tests.yml

@@ -100,30 +100,22 @@ jobs:
           ui.editors,
           ui.htmlEditor,
           ui.grid,
-          ui.scheduler(1/2),
-          ui.scheduler(2/2),
+          ui.scheduler,
           viz
         ]
         TIMEZONE: ['']
         CSP: ['true']
         useJQuery: ['false']
         include:
-          - CONSTEL: ui.scheduler(1/2)
-            TIMEZONE: US/Pacific
-            useJQuery: 'false'
-          - CONSTEL: ui.scheduler(2/2)
+          - CONSTEL: ui.scheduler
             TIMEZONE: US/Pacific
             useJQuery: 'false'
           - CONSTEL: misc
             CSP: 'false'
             useJQuery: 'true'
-          - CONSTEL: ui.widgets(1/2)
+          - CONSTEL: ui.widgets
             CSP: 'false'
             useJQuery: 'false'
-          - CONSTEL: ui.widgets(2/2)
-            CSP: 'false'
-            useJQuery: 'false'
-
     steps:
     - name: Get sources
       uses: actions/checkout@v4
@@ -148,15 +140,11 @@ jobs:
       matrix:
         constel: [
           'ui',
-          'ui.widgets(1/2)',
-          'ui.widgets(2/2)',
-          'ui.editors(1/2)',
-          'ui.editors(2/2)',
+          'ui.widgets',
+          'ui.editors',
           'ui.htmlEditor',
-          'ui.grid(1/2)',
-          'ui.grid(2/2)',
-          'ui.scheduler(1/2)',
-          'ui.scheduler(2/2)',
+          'ui.grid',
+          'ui.scheduler',
           'viz'
         ]
 

packages/devextreme-scss/scss/widgets/material/_colors.scss

@@ -17,7 +17,7 @@ $material-color-theme-modificator: null !default;
 * $name 10. Font family
 * $type text
 */
-$base-font-family: roboto, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, noto, helvetica, arial, sans-serif !default;
+$base-font-family: roboto, robotofallback, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, noto, helvetica, arial, sans-serif !default;
 
 /**
 * $name 20. Text color

packages/devextreme/docker-ci.sh

@@ -156,7 +156,7 @@ function start_runner_watchdog {
     local last_suite_time=unknown
 
     while true; do
-        sleep 180
+        sleep 300
 
         if [ ! -f $last_suite_time_file ] || [ $(cat $last_suite_time_file) == $last_suite_time ]; then
             echo "Runner stalled"

packages/devextreme/testing/runner/Views/Main/RunAll.cshtml

@@ -85,15 +85,10 @@
             WORKER_COUNT;
 
         var calcWorkerFrameCount = function() {
-            if(runWorkerInNewWindow)
-                return 1; // NOTE: more than 1 window cause problems with tests that use focus
+            @* if(runWorkerInNewWindow)
+                return 1; // NOTE: more than 1 window cause problems with tests that use focus *@
 
-            var ua = navigator.userAgent;
-
-            if(window.ActiveXObject !== undefined)
-                return 1;
-
-            return 10;
+            return 4;
         };
 
         WORKER_COUNT = calcWorkerFrameCount();
@@ -274,6 +269,8 @@
         };
 
         window.RUNNER_ON_TEST_START = function(worker, qunitData) {
+            notifyIsAlive();
+
             var i = indexFromWorkerName(worker),
                 testSuite = suitesInProgress[i];
 
@@ -421,6 +418,8 @@
         };
 
         window.RUNNER_ON_DONE = function(worker, qunitData) {
+            notifyIsAlive();
+
             var suite = suitesInProgress[indexFromWorkerName(worker)],
                 passed = !qunitData.failed;
 
@@ -471,6 +470,9 @@
         }
 
         createWorkers();
+        setInterval(function() {
+            notifyIsAlive();
+        }, 60000);
         runFirstBatch();
     });
 </script>

packages/devextreme/testing/runner/Views/Main/RunSuite.cshtml

@@ -64,7 +64,11 @@
         window.INTRANET = @Html.Raw(Json.Serialize(Model.IsIntranet));
 
         QUnit.config.autostart = false;
+        QUnit.config.reporters = QUnit.config.reporters || {};
+        QUnit.config.reporters.html = false;
         QUnit.config.failOnZeroTests = false;
+
+        QUnit.config.reporters.perf = true; 
     </script>
     <script src="@Url.ContentWithCacheBuster("~/packages/devextreme/testing/helpers/qunitExtensions.js")"></script>
 
@@ -80,8 +84,6 @@
             pointer-events: auto;
         }
 
-
-
         a.up {
             width: 30px;
             height: 30px;