merge tasks to avoid duplication

Author: EugeniyKiyashko

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

@@ -208,30 +208,6 @@ jobs:
           headless: 'true'
           useCsp: 'true'
 
-  qunit-tests-no-csp:
-    needs: build
-    runs-on: devextreme-shr2
-    name: ${{ matrix.constel }}-no-csp
-    timeout-minutes: 25
-    strategy:
-      fail-fast: false
-      matrix:
-        constel: [ 'misc(1/2)', 'misc(2/2)' ]
-
-    steps:
-      - name: Get sources
-        uses: actions/checkout@v4
-
-      - name: Run QUnit tests
-        uses: ./.github/actions/run-qunit-tests
-        with:
-          name: ${{ matrix.constel }}-no-csp
-          constel: ${{ matrix.constel }}
-          browser: 'chrome'
-          useJQuery: 'true'
-          headless: 'true'
-          useCsp: 'false'
-
   notify:
     runs-on: devextreme-shr2
     name: Send notifications
@@ -240,7 +216,6 @@ jobs:
       # qunit-tests-performance,
       qunit-tests-mobile-and-shadow-dom,
       qunit-tests-firefox,
-      qunit-tests-no-csp
     ]
     if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
 

.github/workflows/qunit_tests.yml

@@ -96,11 +96,16 @@ jobs:
           viz
         ]
         TIMEZONE: ['']
+        CSP: ['true']
         include:
           - CONSTEL: ui.scheduler(1/2)
             TIMEZONE: US/Pacific
+            CSP: 'true'
           - CONSTEL: ui.scheduler(2/2)
             TIMEZONE: US/Pacific
+            CSP: 'true'
+          - CONSTEL: misc
+            CSP: 'false'
 
     steps:
     - name: Get sources
@@ -109,11 +114,10 @@ jobs:
     - name: Run QUnit tests
       uses: ./.github/actions/run-qunit-tests
       with:
-        name: Constel ${{ matrix.CONSTEL }}${{ matrix.TIMEZONE != '' && format('-{0}', matrix.TIMEZONE) || '' }}
+        name: Constel ${{ matrix.CONSTEL }}${{ matrix.TIMEZONE != '' && format('-{0}', matrix.TIMEZONE) || '' }}${{ matrix.CSP == 'false' && '-no-csp' || '' }}
         constel: ${{ matrix.CONSTEL }}
         timezone: ${{ matrix.TIMEZONE }}
-        useCsp: 'false'
-        # useCsp: 'true'
+        useCsp: ${{ matrix.CSP }}
 
   notify:
     runs-on: devextreme-shr2