Move phpunit.xml into root to make PHPUnit easier to run

This seems to be pretty standard. Can just run `vendor/bin/phpunit` without any arguments. Removes the need for `composer test` (which is not ideal anyway as it removes colours from the output).
flarum · Jun 4, 2016 · 6db27df · 6db27df
1 parent 58d7be9
commit 6db27df
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - composer install
 
 script:
-  - vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover=coverage.xml
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
 
 notifications:
   email:

diff --git a/composer.json b/composer.json
@@ -72,9 +72,6 @@
             "Tests\\": "tests/"
         }
     },
-    "scripts": {
-        "test": "vendor/bin/phpunit -c tests/phpunit.xml"
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.1.x-dev"

diff --git a/tests/phpunit.xml → phpunit.xml b/tests/phpunit.xml → phpunit.xml
@@ -12,13 +12,8 @@
 
     <testsuites>
         <testsuite name="all">
-            <directory suffix="Test.php">./</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-    </php>
-
 </phpunit>