No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.ci/install.sh b/.ci/install.sh
	index 37d21fb9c..dc22059f9 100755
	--- a/.ci/install.sh
	+++ b/.ci/install.sh
	@@ -1,24 +1,22 @@
	#!/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/.ci/run.sh b/.ci/run.sh
	index f15a43684..921db2c57 100755
	--- a/.ci/run.sh
	+++ b/.ci/run.sh
	@@ -1,21 +1,22 @@
	#!/bin/bash

	# The script is intended for use on Travis with Trusty distribution
	# It executes unit and functional tests

	-cd ..
	+DIR=$(dirname $0)
	+cd $DIR/..

	if [ "$CODE_COVERAGE" = 1 ]
	then
	- CODE_COVERAGE_ARGS="--coverage-text";
	+ 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