diff options
| -rwxr-xr-x | .ci/install.sh | 24 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | tests/Browser/README.md | 3 |
3 files changed, 28 insertions, 5 deletions
diff --git a/.ci/install.sh b/.ci/install.sh new file mode 100755 index 000000000..37d21fb9c --- /dev/null +++ b/.ci/install.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# The script is intended for use on Travis with Trusty distribution + +set -x + +DIR=$(dirname $0) + +# Enable xdebug for code coverage +if [ "$CODE_COVERAGE" != 1 ]; then phpenv config-rm xdebug.ini || true; fi + +cd $DIR/.. + +cp composer.json-dist composer.json + +# Add laravel/dusk for Browser tests +if [ "$BROWSER_TESTS" = 1 ]; then composer require "laravel/dusk:~5.7.0" --no-update; fi + +# Remove qr-code as it requires php-gd which is not always available on Travis +# and we don't really need it for tests +composer remove endroid/qr-code --no-update + +# Install PHP dependencies +composer install --prefer-dist diff --git a/.travis.yml b/.travis.yml index 34e8fa542..9aceae007 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,7 @@ cache: - $HOME/.composer install: - - if [ "$CODE_COVERAGE" != 1 ]; then phpenv config-rm xdebug.ini || true; fi - - cp composer.json-dist composer.json - - if [ "$BROWSER_TESTS" = 1 ]; then composer require "laravel/dusk:~5.7.0" --no-update; fi - - composer remove endroid/qr-code --no-update - - composer install --prefer-dist + - .ci/install.sh script: - if [ "$CODE_COVERAGE" = 1 ]; then CODE_COVERAGE_ARGS="--coverage-text"; fi; vendor/bin/phpunit -c tests/phpunit.xml $CODE_COVERAGE_ARGS diff --git a/tests/Browser/README.md b/tests/Browser/README.md index 56f5d10ca..3c7b2c5ef 100644 --- a/tests/Browser/README.md +++ b/tests/Browser/README.md @@ -46,6 +46,9 @@ Please, keep the file as simple as possible, i.e. containing only database and imap/smtp settings needed for the test user authentication. We would want to test default configuration. Especially only Elastic skin is supported. +NOTE: See `.ci` directory for sample config and scripts we use for in-browser +tests on Travis. + EXECUTING THE TESTS ------------------- |