diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-04-09 15:39:06 +0300 |
---|---|---|
committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-04-09 22:50:30 +0300 |
commit | ea21fe2dbcb9dd38c4fc8cfa49c2718c6e652af1 (patch) | |
tree | 5bf7e25413f070091b787115916e20e1a60539e9 /tests/acceptance/run-local.sh | |
parent | a09b787a01cfbd00270321fdddcfb87574327e5b (diff) |
Add support for setting the domain also when a specific helper is used
Before, the domain was automatically added assuming that the
NextcloudTestServerContext had no parameters defined in the Behat
configuration. However, in order to use a helper for Apache it would
need to be specified in the configuration with something like:
- NextcloudTestServerContext:
nextcloudTestServerHelper: NextcloudTestServerLocalApacheHelper
The substitution now works both when a helper is specified and when it
is not; note, however, that providing custom parameters to the helper is
not supported, although they are not needed anyway so it is not really a
problem.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'tests/acceptance/run-local.sh')
-rwxr-xr-x | tests/acceptance/run-local.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index dc17d7ba60f..fcf6155d6f7 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -144,8 +144,12 @@ if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then # https://github.com/Behat/Behat/issues/983). Thus, the default "behat.yml" # configuration file has to be adjusted to provide the appropriate # parameters for NextcloudTestServerContext. + # + # Note that the substitution below is only valid if no parameters for + # the helper are set in behat.yml, although it is valid if a specific + # helper is. ORIGINAL="\ - - NextcloudTestServerContext" + - NextcloudTestServerContext:\?" REPLACEMENT="\ - NextcloudTestServerContext:\n\ nextcloudTestServerHelperParameters:\n\ |