Skip to content

Commit

Permalink
Test against v2 on PHP 7.1 and up (ezsystems#35)
Browse files Browse the repository at this point in the history
* Test against v2 on PHP 7.1 and up

* Try to rather run behat against REST test suite

* Check for bin/console

* Adapt behat suite usage
  • Loading branch information
andrerom committed Feb 11, 2019
1 parent 11f9678 commit a00f8cb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -13,8 +13,8 @@ env:
- FORMAT_VERSION="v1"
matrix:
# Run once per Dockerfile-<PHP_VERSION>
- PHP_VERSION="5.6" XDEBUG_CHANNEL="xdebug-2.5.5" EZ_VERSION="v1.13.4-beta1 || ^1.13.4"
- PHP_VERSION="7.0"
- PHP_VERSION="5.6" XDEBUG_CHANNEL="xdebug-2.5.5" EZ_VERSION="^1.13.4"
- PHP_VERSION="7.0" EZ_VERSION="^1.13.4"
- PHP_VERSION="7.1"
- PHP_VERSION="7.2"

Expand Down
14 changes: 11 additions & 3 deletions bin/.travis/test.sh
Expand Up @@ -29,8 +29,8 @@ if [ "$FORMAT_VERSION" = "" ]; then
fi

if [ "$EZ_VERSION" = "" ]; then
# pull in latest stable by default (TODO: change to be able to test against v2)
EZ_VERSION="^1.13.0"
# pull in latest stable by default
EZ_VERSION="^2.4"
fi


Expand Down Expand Up @@ -94,7 +94,15 @@ export COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/sel
docker-compose -f doc/docker/install.yml up --abort-on-container-exit

docker-compose up -d --build --force-recreate
docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php app/console cache:warmup; php bin/behat -vv --profile=platformui --tags='@common'"
if [ -f bin/console ]; then
echo '> Workaround for v2 test issues: Change ownership of files inside docker container'
docker-compose exec app sh -c 'chown -R www-data:www-data /var/www'

docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console cache:warmup; php bin/behat -v --profile=rest --suite=fullJson --tags=~@broken"
else
docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php app/console cache:warmup; php bin/behat -v --profile=platformui --tags='@common'"
fi

docker-compose down -v

# Remove custom tag aliases used for Platform testing
Expand Down

0 comments on commit a00f8cb

Please sign in to comment.