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 | 932b75c166500c6a8a1dc324f1b678dc33780e06 (patch) | |
tree | f23c57f5acf4ee5125ea6f2dfb2a4f8b9fbad36d /travis | |
parent | 3a2ccd079e10e066d2c96bc9a1f193dcfb7cc5d5 (diff) | |
parent | 505ee586ff17a6e1a960cfee28c8c395da040629 (diff) | |
download | forums-932b75c166500c6a8a1dc324f1b678dc33780e06.tar forums-932b75c166500c6a8a1dc324f1b678dc33780e06.tar.gz forums-932b75c166500c6a8a1dc324f1b678dc33780e06.tar.bz2 forums-932b75c166500c6a8a1dc324f1b678dc33780e06.tar.xz forums-932b75c166500c6a8a1dc324f1b678dc33780e06.zip |
Merge pull request #3065 from dhruvgoel92/feature/phantom
[feature/phantom]
* dhruvgoel92/feature/phantom:
[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')
-rwxr-xr-x | travis/install-phpbb-test-dependencies.sh | 16 | ||||
-rw-r--r-- | travis/phpunit-mariadb-travis.xml | 4 | ||||
-rw-r--r-- | travis/phpunit-mysql-travis.xml | 4 | ||||
-rw-r--r-- | travis/phpunit-mysqli-travis.xml | 4 | ||||
-rw-r--r-- | travis/phpunit-postgres-travis.xml | 4 | ||||
-rw-r--r-- | travis/phpunit-sqlite3-travis.xml | 4 | ||||
-rwxr-xr-x | travis/setup-phpbb.sh | 1 |
7 files changed, 37 insertions, 0 deletions
diff --git a/travis/install-phpbb-test-dependencies.sh b/travis/install-phpbb-test-dependencies.sh new file mode 100755 index 0000000000..25743ff2b1 --- /dev/null +++ b/travis/install-phpbb-test-dependencies.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited <https://www.phpbb.com> +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set -x + +cd tests +php ../composer.phar install --dev --no-interaction --prefer-source +cd .. diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml index aa245a8224..53a206b9b0 100644 --- a/travis/phpunit-mariadb-travis.xml +++ b/travis/phpunit-mariadb-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> diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 21122ccaeb..d0d3e3c0c0 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-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> diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml index 60c279d774..4c963895fc 100644 --- a/travis/phpunit-mysqli-travis.xml +++ b/travis/phpunit-mysqli-travis.xml @@ -16,6 +16,7 @@ <directory suffix="_test.php">../tests</directory> <exclude>../tests/functional</exclude> <exclude>../tests/lint_test.php</exclude> + <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Lint Test"> <file>../tests/lint_test.php</file> @@ -23,6 +24,9 @@ <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> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 956278e90c..fa497a1264 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-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> 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> diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index d829772196..205f23b876 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -33,6 +33,7 @@ fi if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] then travis/setup-webserver.sh + travis/install-phpbb-test-dependencies.sh fi cd phpBB |