Skip to content

Commit e376017

Browse files
Merge branch '25_2' into 25_2_update_testcafe
2 parents 87fb3d0 + c973b69 commit e376017

File tree

5 files changed

+16
-31
lines changed

5 files changed

+16
-31
lines changed

.github/workflows/qunit_tests.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,22 @@ jobs:
100100
ui.editors,
101101
ui.htmlEditor,
102102
ui.grid,
103-
ui.scheduler(1/2),
104-
ui.scheduler(2/2),
103+
ui.scheduler,
105104
viz
106105
]
107106
TIMEZONE: ['']
108107
CSP: ['true']
109108
useJQuery: ['false']
110109
include:
111-
- CONSTEL: ui.scheduler(1/2)
112-
TIMEZONE: US/Pacific
113-
useJQuery: 'false'
114-
- CONSTEL: ui.scheduler(2/2)
110+
- CONSTEL: ui.scheduler
115111
TIMEZONE: US/Pacific
116112
useJQuery: 'false'
117113
- CONSTEL: misc
118114
CSP: 'false'
119115
useJQuery: 'true'
120-
- CONSTEL: ui.widgets(1/2)
116+
- CONSTEL: ui.widgets
121117
CSP: 'false'
122118
useJQuery: 'false'
123-
- CONSTEL: ui.widgets(2/2)
124-
CSP: 'false'
125-
useJQuery: 'false'
126-
127119
steps:
128120
- name: Get sources
129121
uses: actions/checkout@v4
@@ -148,15 +140,11 @@ jobs:
148140
matrix:
149141
constel: [
150142
'ui',
151-
'ui.widgets(1/2)',
152-
'ui.widgets(2/2)',
153-
'ui.editors(1/2)',
154-
'ui.editors(2/2)',
143+
'ui.widgets',
144+
'ui.editors',
155145
'ui.htmlEditor',
156-
'ui.grid(1/2)',
157-
'ui.grid(2/2)',
158-
'ui.scheduler(1/2)',
159-
'ui.scheduler(2/2)',
146+
'ui.grid',
147+
'ui.scheduler',
160148
'viz'
161149
]
162150

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $material-color-theme-modificator: null !default;
1717
* $name 10. Font family
1818
* $type text
1919
*/
20-
$base-font-family: roboto, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, noto, helvetica, arial, sans-serif !default;
20+
$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;
2121

2222
/**
2323
* $name 20. Text color

packages/devextreme/docker-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function start_runner_watchdog {
156156
local last_suite_time=unknown
157157

158158
while true; do
159-
sleep 180
159+
sleep 60
160160

161161
if [ ! -f $last_suite_time_file ] || [ $(cat $last_suite_time_file) == $last_suite_time ]; then
162162
echo "Runner stalled"

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,10 @@
8585
WORKER_COUNT;
8686
8787
var calcWorkerFrameCount = function() {
88-
if(runWorkerInNewWindow)
89-
return 1; // NOTE: more than 1 window cause problems with tests that use focus
88+
@* if(runWorkerInNewWindow)
89+
return 1; // NOTE: more than 1 window cause problems with tests that use focus *@
9090
91-
var ua = navigator.userAgent;
92-
93-
if(window.ActiveXObject !== undefined)
94-
return 1;
95-
96-
return 10;
91+
return 4;
9792
};
9893
9994
WORKER_COUNT = calcWorkerFrameCount();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@
6464
window.INTRANET = @Html.Raw(Json.Serialize(Model.IsIntranet));
6565
6666
QUnit.config.autostart = false;
67+
QUnit.config.reporters = QUnit.config.reporters || {};
68+
QUnit.config.reporters.html = false;
6769
QUnit.config.failOnZeroTests = false;
70+
71+
QUnit.config.reporters.perf = true;
6872
</script>
6973
<script src="@Url.ContentWithCacheBuster("~/packages/devextreme/testing/helpers/qunitExtensions.js")"></script>
7074

@@ -80,8 +84,6 @@
8084
pointer-events: auto;
8185
}
8286
83-
84-
8587
a.up {
8688
width: 30px;
8789
height: 30px;

0 commit comments

Comments
 (0)