aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/phpunit.xml.dist8
-rw-r--r--phpunit.xml.dist33
2 files changed, 1 insertions, 40 deletions
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
index 2b41503b..463d3384 100644
--- a/app/phpunit.xml.dist
+++ b/app/phpunit.xml.dist
@@ -8,19 +8,13 @@
8 bootstrap="bootstrap.php.cache" 8 bootstrap="bootstrap.php.cache"
9> 9>
10 <testsuites> 10 <testsuites>
11 <testsuite name="Project Test Suite"> 11 <testsuite name="wallabag Test Suite">
12 <directory>../src/*/*Bundle/Tests</directory> 12 <directory>../src/*/*Bundle/Tests</directory>
13 <directory>../src/*/Bundle/*Bundle/Tests</directory> 13 <directory>../src/*/Bundle/*Bundle/Tests</directory>
14 <directory>../src/*Bundle/Tests</directory> 14 <directory>../src/*Bundle/Tests</directory>
15 </testsuite> 15 </testsuite>
16 </testsuites> 16 </testsuites>
17 17
18 <!--
19 <php>
20 <server name="KERNEL_DIR" value="/path/to/your/app/" />
21 </php>
22 -->
23
24 <filter> 18 <filter>
25 <whitelist> 19 <whitelist>
26 <directory>../src</directory> 20 <directory>../src</directory>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index d628ac33..00000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2
3<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
4
5<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6 xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
7 backupGlobals="false"
8 colors="true"
9 >
10
11 <testsuites>
12 <testsuite name="wallabag Test Suite">
13 <directory>src/*/*Bundle/Tests</directory>
14 <directory>src/*/Bundle/*Bundle/Tests</directory>
15 <directory>src/*Bundle/Tests</directory>
16 </testsuite>
17 </testsuites>
18
19 <filter>
20 <whitelist>
21 <directory>src</directory>
22 <exclude>
23 <directory>src/*Bundle/Resources</directory>
24 <directory>src/*Bundle/Tests</directory>
25 <directory>src/*/*Bundle/Resources</directory>
26 <directory>src/*/*Bundle/Tests</directory>
27 <directory>src/*/Bundle/*Bundle/Resources</directory>
28 <directory>src/*/Bundle/*Bundle/Tests</directory>
29 </exclude>
30 </whitelist>
31 </filter>
32
33</phpunit> \ No newline at end of file