Merge branch '25_2' into 25_2_demos_vue_ts_scheduler

Author: GoodDayForSurf

.github/workflows/qunit_tests-additional-renovation.yml

@@ -72,58 +72,6 @@ jobs:
           path: packages/devextreme/artifacts.zip
           retention-days: 1
 
-  qunit-tests-mobile-and-shadow-dom:
-    needs: build
-    runs-on: devextreme-shr2
-    name: ${{ matrix.constel }}-${{ matrix.kind }}
-    timeout-minutes: 25
-    strategy:
-      fail-fast: false
-      matrix:
-        constel: [
-          'ui',
-          'ui.widgets(1/3)',
-          'ui.widgets(2/3)',
-          'ui.widgets(3/3)',
-          'ui.editors(1/2)',
-          'ui.editors(2/2)',
-          'ui.htmlEditor',
-          'ui.grid(1/4)',
-          'ui.grid(2/4)',
-          'ui.grid(3/4)',
-          'ui.grid(4/4)',
-          'ui.scheduler(1/3)',
-          'ui.scheduler(2/3)',
-          'ui.scheduler(3/3)',
-          'viz'
-        ]
-        kind: [ 'shadow-dom', 'ios10', 'android6' ]
-        include:
-          - kind: 'shadow-dom'
-            userAgent: ''
-            useShadowDom: true
-          - kind: 'ios10'
-            userAgent: 'ios10'
-          - kind: 'android6'
-            userAgent: 'android6'
-            useJQuery: true
-
-    steps:
-      - name: Get sources
-        uses: actions/checkout@v4
-
-      - name: Run QUnit tests
-        uses: ./.github/actions/run-qunit-tests
-        with:
-          name: ${{ matrix.constel }}-${{ matrix.kind }}
-          constel: ${{ matrix.constel }}
-          browser: 'chrome'
-          useJQuery: ${{ matrix.useJquery || 'false' }}
-          userAgent: ${{ matrix.userAgent }}
-          useShadowDom: ${{ matrix.useShadowDom }}
-          headless: 'true'
-          useCsp: 'true'
-
   qunit-tests-firefox:
     needs: build
     runs-on: devextreme-shr2
@@ -190,7 +138,6 @@ jobs:
     name: Send notifications
     needs: [
       build,
-      qunit-tests-mobile-and-shadow-dom,
       qunit-tests-firefox,
     ]
     if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')

.github/workflows/qunit_tests.yml

@@ -121,10 +121,53 @@ jobs:
         useJQuery: ${{ matrix.useJQuery }}
         useCsp: ${{ matrix.CSP }}
 
+  qunit-tests-shadow-dom:
+    needs: build
+    runs-on: devextreme-shr2
+    name: ${{ matrix.constel }}-shadow-dom
+    timeout-minutes: 25
+    strategy:
+      fail-fast: false
+      matrix:
+        constel: [
+          'ui',
+          'ui.widgets(1/3)',
+          'ui.widgets(2/3)',
+          'ui.widgets(3/3)',
+          'ui.editors(1/2)',
+          'ui.editors(2/2)',
+          'ui.htmlEditor',
+          'ui.grid(1/4)',
+          'ui.grid(2/4)',
+          'ui.grid(3/4)',
+          'ui.grid(4/4)',
+          'ui.scheduler(1/3)',
+          'ui.scheduler(2/3)',
+          'ui.scheduler(3/3)',
+          'viz'
+        ]
+
+    steps:
+      - name: Get sources
+        uses: actions/checkout@v4
+
+      - name: Run QUnit tests
+        uses: ./.github/actions/run-qunit-tests
+        with:
+          name: ${{ matrix.constel }}-shadow-dom
+          constel: ${{ matrix.constel }}
+          useJQuery: 'true'
+          useShadowDom: 'true'
+          useCsp: 'true'
+
   notify:
     runs-on: devextreme-shr2
     name: Send notifications
-    needs: [build, qunit-tests]
+    needs: [
+      build,
+      qunit-tests-shadow-dom,
+      qunit-tests,
+    ]
     if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
 
     steps:

packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/milestone.tests.js

@@ -63,7 +63,7 @@ QUnit.module('Milestone', moduleConfig, () => {
 
     test('custom template, custom html', function(assert) {
         const customHtml = $(document.createElement('div')).text('milestone');
-        const customTaskFunction = (item, container) => {
+        const customTaskFunction = (item, _) => {
             if(item.isMilestone) {
                 return customHtml.text();
             }
@@ -78,7 +78,7 @@ QUnit.module('Milestone', moduleConfig, () => {
 
     test('custom template, custom html + task html', function(assert) {
         const customHtml = $(document.createElement('div')).text('milestone');
-        const customTaskFunction = (item, container) => {
+        const customTaskFunction = (item, _) => {
             if(item.isMilestone) {
                 $(item.taskHTML[1].cloneNode(true)).appendTo(customHtml);
                 return customHtml.html();
@@ -107,7 +107,12 @@ QUnit.module('Milestone', moduleConfig, () => {
         assert.false(children.eq(0).hasClass(Consts.TASK_TITLE_SELECTOR), 'child is not task title');
     });
 
-    QUnit.skipInShadowDomMode('position is correctly calculated', function(assert) {
+    QUnit.test('position is correctly calculated', function(assert) {
+        if(QUnit.urlParams['shadowDom']) {
+            assert.ok(true);
+            return;
+        }
+
         const { platform } = devices.real();
         if(['android', 'ios'].includes(platform)) {
             assert.expect(0);
@@ -118,7 +123,7 @@ QUnit.module('Milestone', moduleConfig, () => {
             { 'id': 2, 'parentId': 1, 'title': 'Milestone 1', 'start': new Date('2019-02-21'), 'end': new Date('2019-02-21'), 'progress': 0 },
             { 'id': 3, 'parentId': 2, 'title': 'Milestone 2', 'start': new Date('2019-02-21'), 'end': new Date('2019-02-21'), 'progress': 0 },
         ];
-        const customTaskFunction = (item, container) => {
+        const customTaskFunction = (item, _) => {
             if(item.isMilestone) {
                 const style = item.taskData.id === 2 ? 'width: 10px; height: 10px;' : 'width: 100px; height: 50px;';
                 return $(document.createElement('div')).attr('style', style);