diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:09:22 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:09:22 +0100 |
| commit | c755aa91e82852d2c81569ddf173900c93106f91 (patch) | |
| tree | c0d2b1c71096d1aae6326c54fb836e1e1a94232b /travis/phpunit-sqlite3-travis.xml | |
| parent | e874e1ea47f3774826864dcc5dcca6382acbc2f9 (diff) | |
| parent | 932b75c166500c6a8a1dc324f1b678dc33780e06 (diff) | |
| download | forums-c755aa91e82852d2c81569ddf173900c93106f91.tar forums-c755aa91e82852d2c81569ddf173900c93106f91.tar.gz forums-c755aa91e82852d2c81569ddf173900c93106f91.tar.bz2 forums-c755aa91e82852d2c81569ddf173900c93106f91.tar.xz forums-c755aa91e82852d2c81569ddf173900c93106f91.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12962] Rename setup-phpbb-test
[ticket/12962] Use phpVersion in phpunit.xml
[ticket/12962] Functional tests run for php <5.3.19
[ticket/12962] Clean up composer.json
[ticket/12962] Fix Line Endings in bootstrap
[ticket/12962] Load composer test dependencies for php >= 5.3.19
[ticket/12962] bootstrap functional and ui test when php >5.3.19
[ticket/12962] Install test dependencies on travis
[ticket/12962] Add facebook/webdriver dependency
[ticket/12962] Fix whitespace characters
[ticket/12962] Run tests for all databases on Travis
[ticket/12962] Force language=en for UI tests installation
[ticket/12962] Dump server output to /dev/null
[ticket/12962] Start phantomjs on travis in background
[ticket/12962] Mark test skipped when phantom server not running
[ticket/12962] Add setup-phantomjs-server.sh
[ticket/12962] Run UI tests on Travis-mysql
[ticket/12962] Add UI tests to phpunit.xml.dist
[ticket/12962] Add quick-links JS test
[ticket/12962] Add initial class for ui_testing
Diffstat (limited to 'travis/phpunit-sqlite3-travis.xml')
| -rw-r--r-- | travis/phpunit-sqlite3-travis.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml index 72b8b8c8ca..5baab791e0 100644 --- a/travis/phpunit-sqlite3-travis.xml +++ b/travis/phpunit-sqlite3-travis.xml @@ -16,10 +16,14 @@ <directory suffix="_test.php">../tests</directory> <exclude>../tests/functional</exclude> <exclude>../tests/lint_test.php</exclude> + <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> </testsuite> + <testsuite name="phpBB UI Tests"> + <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> + </testsuite> </testsuites> <groups> |