From 561fdf644d7ea9dcbeca7a75adeb9a50cba378f7 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Thu, 9 Jul 2020 10:35:26 +0100
Subject: [PATCH] Tweaked test config

---
 .github/workflows/tests.yml |  2 +-
 .gitignore                  |  1 +
 Makefile                    |  2 +-
 phpunit.xml.dist            | 34 +++++++++++++++++++---------------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3a6c6663f..adbcb5617 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,4 +35,4 @@ jobs:
         run: composer bin phpunit update --no-interaction --no-progress
 
       - name: Execute PHPUnit
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
index 7ae55bb3b..04626b2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.phpunit.result.cache
 composer.lock
 phpstan.neon
 phpunit.xml
diff --git a/Makefile b/Makefile
index 69ec8e519..cf2e6711f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,4 +23,4 @@ psalm-show-info:
 test: phpunit phpstan-analyze psalm-analyze
 
 clean:
-	@rm -rf composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor
+	@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 346f4b5ea..878f0c370 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit backupGlobals="false"
-                 backupStaticAttributes="false"
-                 colors="true"
-                 convertErrorsToExceptions="true"
-                 convertNoticesToExceptions="true"
-                 convertWarningsToExceptions="true"
-                 processIsolation="false"
-                 stopOnFailure="false"
-                 bootstrap="vendor/autoload.php"
-    >
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
     <testsuites>
-        <testsuite name="php-gitlab-api Test Suite">
-            <directory>./test/Gitlab/</directory>
+        <testsuite name="Test Suite">
+            <directory suffix="Test.php">./test</directory>
         </testsuite>
     </testsuites>
-
     <filter>
-        <whitelist>
-            <directory suffix=".php">./lib/Gitlab/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./lib</directory>
         </whitelist>
     </filter>
 </phpunit>