Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>tags/v12.0.0beta1
@@ -481,14 +481,14 @@ pipeline: | |||
acceptance-access-levels: | |||
image: nextcloudci/php7.0:php7.0-7 | |||
commands: | |||
- build/acceptance/run-local.sh allow-git-repository-modifications features/access-levels.feature | |||
- tests/acceptance/run-local.sh allow-git-repository-modifications features/access-levels.feature | |||
when: | |||
matrix: | |||
TESTS-ACCEPTANCE: access-levels | |||
acceptance-login: | |||
image: nextcloudci/php7.0:php7.0-7 | |||
commands: | |||
- build/acceptance/run-local.sh allow-git-repository-modifications features/login.feature | |||
- tests/acceptance/run-local.sh allow-git-repository-modifications features/login.feature | |||
when: | |||
matrix: | |||
TESTS-ACCEPTANCE: login |
@@ -54,13 +54,13 @@ composer install | |||
cd ../../ | |||
echo "Installing and configuring Nextcloud server" | |||
build/acceptance/installAndConfigureServer.sh | |||
tests/acceptance/installAndConfigureServer.sh | |||
echo "Saving the default state so acceptance tests can reset to it" | |||
find . -name ".gitignore" -exec rm --force {} \; | |||
git add --all && echo 'Default state' | git -c user.name='John Doe' -c user.email='john@doe.org' commit --quiet --file=- | |||
cd build/acceptance | |||
cd tests/acceptance | |||
# Ensure that the Selenium server is ready before running the tests. | |||
echo "Waiting for Selenium" |
@@ -118,7 +118,8 @@ function prepareDocker() { | |||
# "docker cp" does not take them into account (the extracted files are set | |||
# to root). | |||
echo "Copying local Git working directory of Nextcloud to the container" | |||
tar --create --file="$NEXTCLOUD_LOCAL_TAR" --exclude=".git" --exclude="./config/config.php" --exclude="./data" --exclude="./data-autotest" --exclude="./tests" --directory=../../ . | |||
tar --create --file="$NEXTCLOUD_LOCAL_TAR" --exclude=".git" --exclude="./build" --exclude="./config/config.php" --exclude="./data" --exclude="./data-autotest" --exclude="./tests" --directory=../../ . | |||
tar --append --file="$NEXTCLOUD_LOCAL_TAR" --directory=../../ tests/acceptance/ | |||
docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud | |||
docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR" | |||
@@ -174,4 +175,4 @@ prepareSelenium | |||
prepareDocker | |||
echo "Running tests" | |||
docker exec $NEXTCLOUD_LOCAL_CONTAINER bash -c "cd nextcloud && build/acceptance/run-local.sh allow-git-repository-modifications $SCENARIO_TO_RUN" | |||
docker exec $NEXTCLOUD_LOCAL_CONTAINER bash -c "cd nextcloud && tests/acceptance/run-local.sh allow-git-repository-modifications $SCENARIO_TO_RUN" |