diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-01-30 11:23:18 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-01-30 11:23:18 +0100 |
| commit | 367664ee87cbfb1bb318f71af84eb84cdbc11555 (patch) | |
| tree | 70d3fd25da97d37a4f646f07bcb8ccbf11ca23f5 | |
| parent | e11e03cb3221c7db241d745f9c3f8bb25a3e6aad (diff) | |
| download | wallabag-367664ee87cbfb1bb318f71af84eb84cdbc11555.tar.gz wallabag-367664ee87cbfb1bb318f71af84eb84cdbc11555.tar.zst wallabag-367664ee87cbfb1bb318f71af84eb84cdbc11555.zip | |
finally fix phpunit and travis?
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | app/phpunit.xml.dist | 31 | ||||
| -rw-r--r-- | phpunit.xml.dist | 29 |
3 files changed, 31 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml index 35702a3e..2971c5b9 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | language: php | 1 | language: php |
| 2 | php: | ||
| 3 | - 5.5 | ||
| 2 | branches: | 4 | branches: |
| 3 | only: | 5 | only: |
| 4 | - refactor \ No newline at end of file | 6 | - refactor \ No newline at end of file |
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist deleted file mode 100644 index 463d3384..00000000 --- a/app/phpunit.xml.dist +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | |||
| 3 | <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html --> | ||
| 4 | <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 5 | xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" | ||
| 6 | backupGlobals="false" | ||
| 7 | colors="true" | ||
| 8 | bootstrap="bootstrap.php.cache" | ||
| 9 | > | ||
| 10 | <testsuites> | ||
| 11 | <testsuite name="wallabag Test Suite"> | ||
| 12 | <directory>../src/*/*Bundle/Tests</directory> | ||
| 13 | <directory>../src/*/Bundle/*Bundle/Tests</directory> | ||
| 14 | <directory>../src/*Bundle/Tests</directory> | ||
| 15 | </testsuite> | ||
| 16 | </testsuites> | ||
| 17 | |||
| 18 | <filter> | ||
| 19 | <whitelist> | ||
| 20 | <directory>../src</directory> | ||
| 21 | <exclude> | ||
| 22 | <directory>../src/*Bundle/Resources</directory> | ||
| 23 | <directory>../src/*Bundle/Tests</directory> | ||
| 24 | <directory>../src/*/*Bundle/Resources</directory> | ||
| 25 | <directory>../src/*/*Bundle/Tests</directory> | ||
| 26 | <directory>../src/*/Bundle/*Bundle/Resources</directory> | ||
| 27 | <directory>../src/*/Bundle/*Bundle/Tests</directory> | ||
| 28 | </exclude> | ||
| 29 | </whitelist> | ||
| 30 | </filter> | ||
| 31 | </phpunit> | ||
diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 00000000..3473d5f9 --- /dev/null +++ b/phpunit.xml.dist | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | |||
| 3 | <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html --> | ||
| 4 | <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 5 | xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" | ||
| 6 | backupGlobals="false" | ||
| 7 | colors="true" | ||
| 8 | bootstrap="app/bootstrap.php.cache" | ||
| 9 | > | ||
| 10 | <testsuites> | ||
| 11 | <testsuite name="wallabag Test Suite"> | ||
| 12 | <directory>src/Wallabag/*Bundle/Tests</directory> | ||
| 13 | </testsuite> | ||
| 14 | </testsuites> | ||
| 15 | |||
| 16 | <filter> | ||
| 17 | <whitelist> | ||
| 18 | <directory>src</directory> | ||
| 19 | <exclude> | ||
| 20 | <directory>src/*Bundle/Resources</directory> | ||
| 21 | <directory>src/*Bundle/Tests</directory> | ||
| 22 | <directory>src/*/*Bundle/Resources</directory> | ||
| 23 | <directory>src/*/*Bundle/Tests</directory> | ||
| 24 | <directory>src/*/Bundle/*Bundle/Resources</directory> | ||
| 25 | <directory>src/*/Bundle/*Bundle/Tests</directory> | ||
| 26 | </exclude> | ||
| 27 | </whitelist> | ||
| 28 | </filter> | ||
| 29 | </phpunit> | ||