From 9a0e71ddeec660f727a20626bbf63cb8463787c0 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 2 Jan 2020 18:24:39 +0100 Subject: [PATCH] Travis: Enable in-browser tests in phone and tablet mode --- .ci/run.sh | 21 +++++++++++++++++++++ .travis.yml | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 .ci/run.sh diff --git a/.ci/run.sh b/.ci/run.sh new file mode 100755 index 000000000..f15a43684 --- /dev/null +++ b/.ci/run.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# The script is intended for use on Travis with Trusty distribution +# It executes unit and functional tests + +cd .. + +if [ "$CODE_COVERAGE" = 1 ] +then + CODE_COVERAGE_ARGS="--coverage-text"; +fi + +vendor/bin/phpunit -c tests/phpunit.xml $CODE_COVERAGE_ARGS + +if [ "$BROWSER_TESTS" = 1 ] && [ $? = 0 ] +then + .ci/setup.sh \ + && TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml \ + && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml \ + && TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml +fi diff --git a/.travis.yml b/.travis.yml index 974443eb4..74dfff041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,7 @@ install: - .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 - - if [ "$BROWSER_TESTS" = 1 ]; then .ci/setup.sh && vendor/bin/phpunit -c tests/Browser/phpunit.xml; fi + - .ci/run.sh notifications: email: false