1 files changed, 20 insertions, 13 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cede1cea..19c1ece3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <phpunit backupGlobals="false"
+<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
-         backupStaticAttributes="false"
-         colors="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         convertErrorsToExceptions="true"
+                 xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         convertNoticesToExceptions="true"
+                 backupGlobals="false"
-         convertWarningsToExceptions="true"
+                 colors="true"
-         processIsolation="false"
+                 bootstrap="bootstrap.php.cache"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="vendor/autoload.php"
                >
        <testsuites>
                <testsuite name="wallabag Test Suite">
-                        <directory>tests</directory>
+                        <directory>../src/*/*Bundle/Tests</directory>
+                        <directory>../src/*/Bundle/*Bundle/Tests</directory>
+                        <directory>../src/*Bundle/Tests</directory>
                </testsuite>
        </testsuites>
        <filter>
                <whitelist>
-                        <directory>inc</directory>
+                        <directory>../src</directory>
+                        <exclude>
+                                <directory>../src/*Bundle/Resources</directory>
+                                <directory>../src/*Bundle/Tests</directory>
+                                <directory>../src/*/*Bundle/Resources</directory>
+                                <directory>../src/*/*Bundle/Tests</directory>
+                                <directory>../src/*/Bundle/*Bundle/Resources</directory>
+                                <directory>../src/*/Bundle/*Bundle/Tests</directory>
+                        </exclude>
                </whitelist>
        </filter>
-</phpunit>
+</phpunit>
+\ No newline at end of file

diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cede1cea..19c1ece3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist
@@ -1,27 +1,34 @@
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2		2
3	<phpunit backupGlobals="false"	3	<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
4	backupStaticAttributes="false"	4
5	colors="true"	5	<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6	convertErrorsToExceptions="true"	6	xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
7	convertNoticesToExceptions="true"	7	backupGlobals="false"
8	convertWarningsToExceptions="true"	8	colors="true"
9	processIsolation="false"	9	bootstrap="bootstrap.php.cache"
10	stopOnFailure="false"
11	syntaxCheck="false"
12	bootstrap="vendor/autoload.php"
13	>	10	>
14		11
15	<testsuites>	12	<testsuites>
16	<testsuite name="wallabag Test Suite">	13	<testsuite name="wallabag Test Suite">
17	<directory>tests</directory>	14	<directory>../src//Bundle/Tests</directory>
		15	<directory>../src//Bundle/Bundle/Tests</directory>
		16	<directory>../src/*Bundle/Tests</directory>
18	</testsuite>	17	</testsuite>
19	</testsuites>	18	</testsuites>
20		19
21	<filter>	20	<filter>
22	<whitelist>	21	<whitelist>
23	<directory>inc</directory>	22	<directory>../src</directory>
		23	<exclude>
		24	<directory>../src/*Bundle/Resources</directory>
		25	<directory>../src/*Bundle/Tests</directory>
		26	<directory>../src//Bundle/Resources</directory>
		27	<directory>../src//Bundle/Tests</directory>
		28	<directory>../src//Bundle/Bundle/Resources</directory>
		29	<directory>../src//Bundle/Bundle/Tests</directory>
		30	</exclude>
24	</whitelist>	31	</whitelist>
25	</filter>	32	</filter>
26		33
27	</phpunit>	34	</phpunit> \ No newline at end of file