Use more of the test-framework

simplesamlphp · Aug 10, 2019 · db8aee0 · db8aee0
1 parent 82bc6a4
commit db8aee0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,9 @@ env:
 before_script:
   - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
   - composer update --no-interaction
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm:1.1.9; fi
 
 script:
-  - bin/check-syntax.sh
+  - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-php.sh
   - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
   - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
 

diff --git a/bin/check-syntax.sh b/bin/check-syntax.sh
diff --git a/composer.json b/composer.json
@@ -33,10 +33,10 @@
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "^1.17",
-        "phpunit/phpunit": "~5.7"
+        "simplesamlphp/simplesamlphp-test-framework": "^0.0.10"
     },
     "support": {
-        "issues": "https://github.com/tvdijen/simplesamlphp-module-adfs/issues",
-        "source": "https://github.com/tvdijen/simplesamlphp-module-adfs"
+        "issues": "https://github.com/simplesamlphp/simplesamlphp-module-adfs/issues",
+        "source": "https://github.com/simplesamlphp/simplesamlphp-module-adfs"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -2,6 +2,7 @@
 <phpunit bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="The project's test suite">
+            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/tests/</directory>
             <directory>tests/</directory>
         </testsuite>
     </testsuites>

diff --git a/tests/www/TemplateTest.php b/tests/www/TemplateTest.php