Update PHPUnit settings

Respect · Jan 12, 2015 · 698f354 · 698f354
1 parent f7dac8e
commit 698f354
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 52 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - phpenv rehash
 
 script:
-  - make testdox
+  - vendor/bin/phpunit --configuration phpunit.xml.dist --colors
 
 notifications:
   irc:

diff --git a/composer.json b/composer.json
@@ -24,5 +24,10 @@
         "psr-4": {
             "Respect\\": "library/Respect"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Stubs\\": "tests/src/Stubs"
+        }
     }
 }
diff --git a/tests/phpunit.xml → phpunit.xml.dist b/tests/phpunit.xml → phpunit.xml.dist
@@ -1,22 +1,21 @@
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false" 
-         bootstrap="bootstrap.php"
+         backupStaticAttributes="false"
          cacheTokens="true"
-         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
          verbose="false">
+    <testsuites>
+        <testsuite>
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="false">
-            <directory>../library/Respect/</directory>
+        <whitelist>
+            <directory>library/</directory>
         </whitelist>
     </filter>
-    <testsuite name="Respect\Rest Test Suite">
-        <directory>.</directory>
-    </testsuite>
 </phpunit>
-
diff --git a/tests/bootstrap.php b/tests/bootstrap.php