From ea6b5063b50753d5573223ec2a804750cc991f51 Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Thu, 28 Jun 2018 17:21:12 +0200 Subject: Fix variable not replaced in "behat.yml" when default value was used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As "selenium.server" is a simulated variable it is not recognized by Mink, so it must be always replaced by its value in "behat.yml" before the file is parsed by Behat. Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/run-local.sh | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index 529026483cf..e924bd94f3f 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -171,21 +171,19 @@ REPLACEMENT="profile: $ACCEPTANCE_TESTS_CONFIG_DIR" FILE_CONTENTS=$(<$ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml) echo "${FILE_CONTENTS//$ORIGINAL/$REPLACEMENT}" > $ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml -if [ "$SELENIUM_SERVER" != "$DEFAULT_SELENIUM_SERVER" ]; then - # Set the Selenium server to be used by Mink. Although Mink sessions can be - # extended through BEHAT_PARAMS this would require adding here too each new - # session added to "behat.yml", including those added in the acceptance - # tests of apps. Instead, the default "behat.yml" configuration file is - # adjusted to replace the simulated "selenium.server" variable by its value - # before the configuration file is parsed by Behat. - ORIGINAL="wd_host: %selenium.server%" - REPLACEMENT="wd_host: http://$SELENIUM_SERVER/wd/hub" - # As the substitution does not involve regular expressions or multilines it - # can be done just with Bash. Moreover, this does not require escaping the - # regular expression characters that may appear in the URL, like "/". - FILE_CONTENTS=$(<$ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml) - echo "${FILE_CONTENTS//$ORIGINAL/$REPLACEMENT}" > $ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml -fi +# Set the Selenium server to be used by Mink. Although Mink sessions can be +# extended through BEHAT_PARAMS this would require adding here too each new +# session added to "behat.yml", including those added in the acceptance +# tests of apps. Instead, the default "behat.yml" configuration file is +# adjusted to replace the simulated "selenium.server" variable by its value +# before the configuration file is parsed by Behat. +ORIGINAL="wd_host: %selenium.server%" +REPLACEMENT="wd_host: http://$SELENIUM_SERVER/wd/hub" +# As the substitution does not involve regular expressions or multilines it +# can be done just with Bash. Moreover, this does not require escaping the +# regular expression characters that may appear in the URL, like "/". +FILE_CONTENTS=$(<$ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml) +echo "${FILE_CONTENTS//$ORIGINAL/$REPLACEMENT}" > $ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml composer install -- cgit v1.2.3