diff --git a/bin/6.0.x-dev/prepare_project_edition.sh b/bin/6.0.x-dev/prepare_project_edition.sh index 9fbf260..3ce9403 100755 --- a/bin/6.0.x-dev/prepare_project_edition.sh +++ b/bin/6.0.x-dev/prepare_project_edition.sh @@ -160,7 +160,14 @@ echo "> Display composer.json for debugging" cat composer.json # Create a default Behat configuration file -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +# Remove Behat configuration files added by recipes (e.g. behat.yml.dist from friends-of-behat/symfony-extension), +# they take precedence over behat.php in Behat's configuration discovery +rm -f behat.yaml behat.yml behat.yaml.dist behat.yml.dist behat.dist.yaml behat.dist.yml behat.php behat.dist.php +if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then + cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php +else + cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +fi # Depenencies are installed and container can be removed docker container stop install_dependencies @@ -202,7 +209,7 @@ fi if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display SPI (Redis) version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" -elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]] then +elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]]; then echo '> Display SPI (Valkey) version for debugging' docker exec valkey sh -c "valkey-cli --version" fi diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 65d6374..ff48133 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -101,7 +101,14 @@ fi sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/bundles.php # Create a default Behat configuration file -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +# Remove Behat configuration files added by recipes (e.g. behat.yml.dist from friends-of-behat/symfony-extension), +# they take precedence over behat.php in Behat's configuration discovery +rm -f behat.yaml behat.yml behat.yaml.dist behat.yml.dist behat.dist.yaml behat.dist.yml behat.php behat.dist.php +if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then + cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php +else + cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +fi # Depenencies are installed and container can be removed docker container stop install_dependencies @@ -142,7 +149,7 @@ fi if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display SPI (Redis) version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" -elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]] then +elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]]; then echo '> Display SPI (Valkey) version for debugging' docker exec valkey sh -c "valkey-cli --version" fi