Install notifications and guests app when they are not there

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 45 insertions, 5 deletions

diff --git a/tests/integration/run.sh b/tests/integration/run.sh
index 51e1e72af..ce3ebd25e 100755
--- a/tests/integration/run.sh
+++ b/tests/integration/run.sh
@@ -1,39 +1,79 @@
 #!/usr/bin/env bash
 
 APP_NAME=spreed
+NOTIFICATIONS_BRANCH="master"
+GUESTS_BRANCH="master"
 
 APP_INTEGRATION_DIR=$PWD
 ROOT_DIR=${APP_INTEGRATION_DIR}/../../../..
+echo ''
+echo '#'
+echo '# Installing composer dependencies from tests/integration/'
+echo '#'
 composer install
 
+echo ''
+echo '#'
+echo '# Starting PHP webserver'
+echo '#'
 php -S localhost:8080 -t ${ROOT_DIR} &
 PHPPID=$!
+echo 'Running on process ID:'
 echo $PHPPID
 
+# also kill php process in case of ctrl+c
+trap 'kill -TERM $PHPPID; wait $PHPPID' TERM
+
 # The federated server is started and stopped by the tests themselves
 PORT_FED=8180
 export PORT_FED
 NEXTCLOUD_ROOT_DIR=${ROOT_DIR}
 export NEXTCLOUD_ROOT_DIR
+export TEST_SERVER_URL="http://localhost:8080/"
+export TEST_REMOTE_URL="http://localhost:8180/"
 
-# also kill php process in case of ctrl+c
-trap 'kill -TERM $PHPPID; wait $PHPPID' TERM
-
+echo ''
+echo '#'
+echo '# Setting up apps'
+echo '#'
 cp -R ./spreedcheats ../../../spreedcheats
+${ROOT_DIR}/occ app:getpath spreedcheats
+
+# Add apps to the parent directory of "spreed" (unless they are
+# already there or in "apps").
+${ROOT_DIR}/occ app:getpath notifications || (cd ../../../ && git clone --depth 1 --branch ${NOTIFICATIONS_BRANCH} https://github.com/nextcloud/notifications)
+${ROOT_DIR}/occ app:getpath guests || (cd ../../../ && git clone --depth 1 --branch ${GUESTS_BRANCH} https://github.com/nextcloud/guests)
+
 ${ROOT_DIR}/occ app:enable spreed || exit 1
 ${ROOT_DIR}/occ app:enable spreedcheats || exit 1
+${ROOT_DIR}/occ app:enable notifications || exit 1
+${ROOT_DIR}/occ app:enable guests || exit 1
+
 ${ROOT_DIR}/occ app:list | grep spreed
+${ROOT_DIR}/occ app:list | grep notifications
+${ROOT_DIR}/occ app:list | grep guests
 
+echo ''
+echo '#'
+echo '# Optimizing configuration'
+echo '#'
 # Disable bruteforce protection because the integration tests do trigger them
 ${ROOT_DIR}/occ config:system:set auth.bruteforce.protection.enabled --value false --type bool
 # Allow local remote urls otherwise we can not share
 ${ROOT_DIR}/occ config:system:set allow_local_remote_servers --value true --type bool
 
-export TEST_SERVER_URL="http://localhost:8080/"
-export TEST_REMOTE_URL="http://localhost:8180/"
+
+echo ''
+echo '#'
+echo '# Running tests'
+echo '#'
 ${APP_INTEGRATION_DIR}/vendor/bin/behat -f junit -f pretty $1 $2
 RESULT=$?
 
+echo ''
+echo '#'
+echo '# Stopping PHP webserver and disabling spreedcheats'
+echo '#'
 kill $PHPPID
 
 ${ROOT_DIR}/occ app:disable spreedcheats