upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #9967 from nextcloud/replace-wd-host-directly-in-behat-yml-instead-of-through-behat-params

Browse source 
Replace "wd_host" directly in "behat.yml" instead of through "BEHAT_PARAMS"
This commit is contained in:
Roeland Jago Douma 2018-06-22 22:10:06 +02:00 committed by GitHub
commit 1f1bd36af8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/acceptance/config/behat.yml
View file

@ -27,14 +27,18 @@ default:
Behat\MinkExtension:
sessions:
default:
selenium2: ~
selenium2:
wd_host: %selenium.server%
John:
selenium2: ~
selenium2:
wd_host: %selenium.server%
Jane:
selenium2: ~
selenium2:
wd_host: %selenium.server%
Rubeus:
# Rubeus uses a browser that has CSS grid support.
selenium2:
wd_host: %selenium.server%
capabilities:
firefox:
profile: %paths.base%/firefox-profiles/css-grid-enabled.zip

43
tests/acceptance/run-local.sh
View file

@ -160,9 +160,9 @@ if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
fi
# Due to a bug in the Mink Extension for Behat it is not possible to use the
# "paths.base" parameter in the path to the custom Firefox profile. Thus, the
# "paths.base" variable in the path to the custom Firefox profile. Thus, the
# default "behat.yml" configuration file has to be adjusted to replace the
# parameter by its value before the configuration file is parsed by Behat.
# variable by its value before the configuration file is parsed by Behat.
ORIGINAL="profile: %paths.base%"
REPLACEMENT="profile: $ACCEPTANCE_TESTS_CONFIG_DIR"
# As the substitution does not involve regular expressions or multilines it can
@ -172,32 +172,19 @@ 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; 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"
}
}
}
}
}
}'
# 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
composer install