Merge split UPE tests with main gateway tests (#7954)

Co-authored-by: Timur Karimov <[email protected]>

.github/workflows/e2e-pull-request.yml

@@ -47,13 +47,8 @@ jobs:
     strategy:
       fail-fast:     false
       matrix:
-        test_groups:   [ 'wcpay', 'subscriptions', 'upe', 'upeSplit' ] # [TODO] Unskip blocks tests after investigating constant failures.
+        test_groups:   [ 'wcpay', 'subscriptions' ] # [TODO] Unskip blocks tests after investigating constant failures.
         test_branches: [ 'merchant', 'shopper' ]
-        exclude:
-          - test_groups: 'upe'
-            test_branches: 'merchant'
-          - test_groups: 'upeSplit'
-            test_branches: 'merchant'
 
     name: WC - latest | ${{ matrix.test_groups }} - ${{ matrix.test_branches }}
 

.github/workflows/e2e-tests-atomic.yml

@@ -26,16 +26,12 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        test_groups: [ 'wcpay', 'subscriptions', 'upe', 'upeSplit' ]
+        test_groups: [ 'wcpay', 'subscriptions' ]
         test_branches: [ 'merchant', 'shopper' ]
         exclude:
           - test_groups: 'subscriptions'
           - test_groups: 'wcpay'
             test_branches: 'merchant'
-          - test_groups: 'upe'
-            test_branches: 'merchant'
-          - test_groups: 'upeSplit'
-            test_branches: 'merchant'
 
     env:
       E2E_GROUP: ${{ matrix.test_groups }}

changelog/merge-upe-non-upe-tests

@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Merge UPE tests into the single and main gateway test file for unit and E2E tests.

tests/e2e/config/jest.config.js

@@ -11,8 +11,6 @@ const e2ePaths = {
 	wcpay: path.resolve( __dirname, '../specs/wcpay' ),
 	subscriptions: path.resolve( __dirname, '../specs/subscriptions' ),
 	blocks: path.resolve( __dirname, '../specs/blocks' ),
-	upe: path.resolve( __dirname, '../specs/upe' ),
-	upeSplit: path.resolve( __dirname, '../specs/upe-split' ),
 };
 
 // Allow E2E tests to run specific tests - wcpay, subscriptions, blocks, all (default).