From ea21fe2dbcb9dd38c4fc8cfa49c2718c6e652af1 Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Mon, 9 Apr 2018 14:39:06 +0200 Subject: Add support for setting the domain also when a specific helper is used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/acceptance/run-local.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests') 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\ -- cgit v1.2.3