diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-07-20 07:56:51 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-20 11:32:58 +0200 |
| commit | fcc157078955974a374fb516b8ea9a0b11c628b2 (patch) | |
| tree | ad4dee062b8fd667177b43b556a3e410ac3e1fa9 | |
| parent | 140b23f85f1b571c3ad6edf9dd511915818559d7 (diff) | |
| download | nextcloud-server-fcc157078955974a374fb516b8ea9a0b11c628b2.tar.gz nextcloud-server-fcc157078955974a374fb516b8ea9a0b11c628b2.zip | |
Add option to acceptance test runner to set the Selenium server
By default "127.0.0.1:4444" is used, so nothing needs to be set when the
acceptance tests and the Selenium server share the same network (like
when called by "run.sh").
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| -rwxr-xr-x | tests/acceptance/run-local.sh | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index 1e4c3224287..e2270be3854 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -64,6 +64,16 @@ if [ "$1" = "--nextcloud-server-domain" ]; then shift 2 fi +# "--selenium-server XXX" option can be provided to set the domain and port used +# by the acceptance tests to access the Selenium server. +DEFAULT_SELENIUM_SERVER="127.0.0.1:4444" +SELENIUM_SERVER="$DEFAULT_SELENIUM_SERVER" +if [ "$1" = "--selenium-server" ]; then + SELENIUM_SERVER=$2 + + shift 2 +fi + # Safety parameter to prevent executing this script by mistake and messing with # the Git repository. if [ "$1" != "allow-git-repository-modifications" ]; then @@ -107,6 +117,35 @@ if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then sed --in-place "s/$ORIGINAL/$REPLACEMENT/" config/behat.yml fi +if [ "$SELENIUM_SERVER" != "$DEFAULT_SELENIUM_SERVER" ]; then + # Set the Selenium server to be used by Mink; this extends the default + # configuration from "config/behat.yml". + export BEHAT_PARAMS=' +{ + "extensions": { + "Behat\\MinkExtension": { + "sessions": { + "default": { + "selenium2": { + "wd_host": "http://'"$SELENIUM_SERVER"'/wd/hub" + } + }, + "John": { + "selenium2": { + "wd_host": "http://'"$SELENIUM_SERVER"'/wd/hub" + } + }, + "Jane": { + "selenium2": { + "wd_host": "http://'"$SELENIUM_SERVER"'/wd/hub" + } + } + } + } + } +}' +fi + composer install cd ../../ @@ -127,6 +166,6 @@ cd tests/acceptance # Ensure that the Selenium server is ready before running the tests. echo "Waiting for Selenium" -timeout 60s bash -c "while ! curl 127.0.0.1:4444 >/dev/null 2>&1; do sleep 1; done" +timeout 60s bash -c "while ! curl $SELENIUM_SERVER >/dev/null 2>&1; do sleep 1; done" vendor/bin/behat $SCENARIO_TO_RUN |