Merge branch 'develop-10' into ECP-9320

Author: candemiralp

.github/Makefile

@@ -142,11 +142,15 @@ phpunit-run:
 	cp vendor/adyen/module-payment/Test/phpunit.xml.dist dev/tests/unit/phpunit.xml
 	cd dev/tests/unit; \
 		../../../vendor/bin/phpunit \
-		--coverage-clover=../../../build/clover.xml \
-		--log-junit=../../../build/tests-log.xml \
+		--coverage-clover=../../../build/clover.xml.dist \
+		--log-junit=../../../build/tests-log.xml.dist \
 		-c phpunit.xml \
 		../../../vendor/adyen/module-payment/Test/Unit
 
+phpunit-fix-report:
+	sed '/file/s/\/var\/www\/html\/vendor\/adyen\/module-payment\///g' ${MAGENTO_ROOT}/build/tests-log.xml.dist >> ${MAGENTO_ROOT}/build/tests-log.xml
+	sed '/file/s/\/var\/www\/html\/vendor\/adyen\/module-payment\///g' ${MAGENTO_ROOT}/build/clover.xml.dist >> ${MAGENTO_ROOT}/build/clover.xml
+
 codesniffer-run:
 	vendor/bin/phpcs --standard=Magento2 \
 		--extensions=php,phtml \

.github/workflows/main.yml

@@ -62,6 +62,9 @@ jobs:
       - name: Run PHPUnit
         run: docker exec magento2-container make phpunit-run
 
+      - name: Format PHPUnit coverage reports
+        run: docker exec magento2-container make phpunit-fix-report
+
       - name: SonarCloud Scan
         if: ${{ env.SONAR_TOKEN }}
         uses: SonarSource/sonarqube-scan-action@master

Test/phpunit.xml.dist

@@ -13,15 +13,10 @@
          bootstrap="./framework/bootstrap.php">
     <source>
         <include>
-            <directory suffix=".php">../../../app/code/*</directory>
-            <directory suffix=".php">../../../lib/internal/Magento</directory>
-            <directory suffix=".php">../../../setup/src/*</directory>
+            <directory suffix=".php">../../../vendor/adyen/module-payment/*</directory>
         </include>
         <exclude>
-            <directory>../../../app/code/*/*/Test</directory>
-            <directory>../../../lib/internal/*/*/Test</directory>
-            <directory>../../../lib/internal/*/*/*/Test</directory>
-            <directory>../../../setup/src/*/*/Test</directory>
+            <directory>../../../vendor/adyen/module-payment/*/*/Test</directory>
         </exclude>
     </source>
     <testsuites>
@@ -32,7 +27,7 @@
     <php>
         <includePath>.</includePath>
         <ini name="memory_limit" value="-1"/>
-        <ini name="date.timezone" value="America/Los_Angeles"/>
+        <ini name="date.timezone" value="Europe/Amsterdam"/>
         <ini name="xdebug.max_nesting_level" value="200"/>
     </php>
     <extensions>