Fix: Merge configuration files

ergebnis · Dec 28, 2021 · 068439f · 068439f
1 parent 068c679
commit 068439f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 46 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -58,7 +58,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Collect code coverage with Xdebug and phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-clover=.build/logs/clover.xml"
+        run: "vendor/bin/phpunit --configuration=test/phpunit.xml --coverage-clover=.build/logs/clover.xml"
 
       - name: "Send code coverage report to Codecov.io"
         env:
@@ -332,7 +332,7 @@ jobs:
           dependencies: "${{ matrix.dependencies }}"
 
       - name: "Run unit tests with phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Unit/phpunit.xml"
+        run: "vendor/bin/phpunit --configuration=test/phpunit.xml --testsuite=unit"
 
       - name: "Run integration tests with phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml"
+        run: "vendor/bin/phpunit --configuration=test/phpunit.xml --testsuite=integration"
diff --git a/Makefile b/Makefile
@@ -51,8 +51,8 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
 .PHONY: tests
 tests: vendor ## Runs unit and integration tests with phpunit/phpunit
 	mkdir -p .build/phpunit
-	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml
-	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml
+	vendor/bin/phpunit --configuration=test/phpunit.xml --testsuite=unit
+	vendor/bin/phpunit --configuration=test/phpunit.xml  --testsuite=integration
 
 vendor: composer.json composer.lock
 	composer validate --strict

diff --git a/test/Unit/phpunit.xml b/test/Unit/phpunit.xml
diff --git a/test/Integration/phpunit.xml → test/phpunit.xml b/test/Integration/phpunit.xml → test/phpunit.xml
@@ -1,15 +1,15 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
     beStrictAboutChangesToGlobalState="true"
     beStrictAboutCoversAnnotation="true"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutResourceUsageDuringSmallTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutTodoAnnotatedTests="true"
-    bootstrap="../../vendor/autoload.php"
+    bootstrap="../vendor/autoload.php"
     cacheResult="true"
-    cacheResultFile="../../.build/phpunit/integration.cache"
+    cacheResultFile="../.build/phpunit/cache"
     colors="true"
     columns="max"
     convertErrorsToExceptions="true"
@@ -24,7 +24,7 @@
 >
     <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
         <include>
-            <directory suffix=".php">../../src/</directory>
+            <directory suffix=".php">../src/</directory>
         </include>
     </coverage>
     <php>
@@ -33,8 +33,11 @@
         <ini name="memory_limit" value="-1"/>
     </php>
     <testsuites>
-        <testsuite name="Integration Tests">
-            <directory>.</directory>
+        <testsuite name="integration">
+            <directory>Integration/</directory>
+        </testsuite>
+        <testsuite name="unit">
+            <directory>Unit/</directory>
         </testsuite>
     </testsuites>
 </phpunit>