Skip to content
Permalink
Browse files

Merge branch '1.7' into 1.13

  • Loading branch information...
mnocon committed Sep 24, 2018
2 parents cb67948 + 85c2d8e commit 3ddbdc58c55004bd9cf49dc1e26e0ff81cbdef76
Showing with 28 additions and 2 deletions.
  1. +4 −1 .travis.yml
  2. +7 −0 behat.yml.dist
  3. +12 −0 bin/.travis/runcommand.sh
  4. +3 −1 composer.json
  5. +1 −0 doc/docker/base-dev.yml
  6. +1 −0 doc/docker/base-prod.yml
@@ -46,7 +46,10 @@ before_script:

# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
# Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker/selenium.yml
script: docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php $TEST_CMD"
script:
- docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php;"
- eval "$TEST_CMD"


after_failure:
# Will show us the last bit of the log of container's main processes
@@ -31,6 +31,13 @@ default:

EzSystems\PlatformBehatBundle\ServiceContainer\EzBehatExtension: ~

Bex\Behat\ScreenshotExtension:
active_image_drivers: cloudinary
image_drivers:
cloudinary:
cloud_name: ezplatformtravis
preset: ezplatform

# default profile: no suites
suites: ~

@@ -0,0 +1,12 @@
#!/bin/sh

set -e

if [ "$1" = "" ]; then
echo "Argument 1 variable for command arguments is empty, please pass arguments"
exit 1
fi

# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
CMD=\"$@\"
docker-compose exec -T --user www-data app bash -c \""$CMD"\"
@@ -59,8 +59,10 @@
"behat/mink-extension": "^2.3.1",
"behat/mink-goutte-driver": "^1.2.1",
"behat/mink-selenium2-driver": "^1.3.1",
"bex/behat-screenshot": "^1.2",
"jarnaiz/behat-junit-formatter": "^1.3.2",
"ezsystems/behatbundle": "^6.5.3"
"ezsystems/behatbundle": "^6.5.3",
"ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0"
},
"suggest": {
"ezsystems/legacy-bridge": "Provides the full legacy backoffice and legacy features"
@@ -10,6 +10,7 @@ services:
depends_on:
- db
environment:
- COMPOSER_MEMORY_LIMIT
- SYMFONY_ENV=${SYMFONY_ENV-dev}
- SYMFONY_DEBUG
- SYMFONY_HTTP_CACHE
@@ -11,6 +11,7 @@ services:
depends_on:
- db
environment:
- COMPOSER_MEMORY_LIMIT
- SYMFONY_ENV=${SYMFONY_ENV-prod}
- SYMFONY_DEBUG
- SYMFONY_HTTP_CACHE

0 comments on commit 3ddbdc5

Please sign in to comment.
You can’t perform that action at this time.