Move phpspec to phpunit tests (#204)

Co-authored-by: Marko Ivančić <[email protected]>
simplesamlphp · Jul 28, 2023 · 0327c2f · 0327c2f
1 parent b7adb69
commit 0327c2f
Show file tree

Hide file tree

Showing 67 changed files with 2,298 additions and 2,537 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -63,7 +63,6 @@ jobs:
         run: |
           echo $NO_COVERAGE
           ./vendor/bin/phpunit $NO_COVERAGE
-          ./vendor/bin/phpspec run
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '7.4' }}

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@
 /vendor/
 /.php_cs.cache
 /composer.lock
-/phpspec.yml
 /phpunit.yml
 .phpunit.result.cache
 /.idea/

diff --git a/composer.json b/composer.json
@@ -36,9 +36,7 @@
         "web-token/jwt-framework": "^2.1"
     },
     "require-dev": {
-        "friends-of-phpspec/phpspec-code-coverage": "^6.1",
         "friendsofphp/php-cs-fixer": "^3",
-        "phpspec/phpspec": "^7.1.0",
         "phpunit/php-code-coverage": "^9.0.0",
         "phpunit/phpcov": "^8.2.0",
         "phpunit/phpunit": "^9.0.0",
@@ -77,8 +75,7 @@
             "vendor/bin/phpcs -p"
         ],
         "tests": [
-            "vendor/bin/phpunit --no-coverage",
-            "vendor/bin/phpspec run "
+            "vendor/bin/phpunit --no-coverage"
         ]
     }
 }
diff --git a/phpcs.xml b/phpcs.xml
@@ -9,7 +9,6 @@
     <file>config-templates</file>
     <file>hooks</file>
     <file>src</file>
-    <file>spec</file>
     <file>tests</file>
     <file>public</file>
 

diff --git a/phpspec.yml.dist b/phpspec.yml.dist
diff --git a/spec/Controller/ClientResetSecretControllerSpec.php b/spec/Controller/ClientResetSecretControllerSpec.php
diff --git a/spec/Controller/ClientShowControllerSpec.php b/spec/Controller/ClientShowControllerSpec.php
diff --git a/spec/Controller/OAuth2AccessTokenControllerSpec.php b/spec/Controller/OAuth2AccessTokenControllerSpec.php