diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-06-28 19:31:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 19:31:19 +0200 |
| commit | dd880d1319fd0197621b2bbcef7972a090439e94 (patch) | |
| tree | be904f8d97d001c182fbc289315dde7a58bb58ea | |
| parent | 111c6ceef9b8963accab1a7e4388da16a9b445bc (diff) | |
| parent | ea6b5063b50753d5573223ec2a804750cc991f51 (diff) | |
| download | nextcloud-server-dd880d1319fd0197621b2bbcef7972a090439e94.tar.gz nextcloud-server-dd880d1319fd0197621b2bbcef7972a090439e94.zip | |
Merge pull request #10042 from nextcloud/fix-variable-not-replaced-in-behat-yml-when-default-value-was-used
Fix variable not replaced in "behat.yml" when default value was used
| -rwxr-xr-x | tests/acceptance/run-local.sh | 28 |
1 files 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 |