Adjust to Nextcloud changes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

.drone.yml

@@ -347,6 +347,15 @@ pipeline:
     when:
       matrix:
         TESTS: integration-filesdrop-features
+  integration-transfer-ownership-features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/transfer-ownership.feature
+    when:
+      matrix:
+        TESTS: integration-transfer-ownership-features
   nodb-codecov:
     image: nextcloudci/php7.0:php7.0-6
     commands:
@@ -392,6 +401,7 @@ matrix:
     - TESTS: integration-sharees-features
     - TESTS: integration-setup-features
     - TESTS: integration-filesdrop-features
+    - TESTS: integration-transfer-ownership-features
     - TESTS: jsunit
     - TESTS: check-autoloader
     - TESTS: app-check-code

build/integration/run.sh

@@ -1,13 +1,24 @@
 #!/usr/bin/env bash
 
-composer install
-
 OC_PATH=../../
 OCC=${OC_PATH}occ
-
 SCENARIO_TO_RUN=$1
 HIDE_OC_LOGS=$2
 
+INSTALLED=$($OCC status | grep installed: | cut -d " " -f 5)
+
+if [ "$INSTALLED" == "true" ]; then
+    # Disable bruteforce protection because the integration tests do trigger them
+    $OCC config:system:set auth.bruteforce.protection.enabled --value false --type bool
+else
+    if [ "$SCENARIO_TO_RUN" != "setup_features/setup.feature" ]; then
+        echo "Nextcloud instance needs to be installed" >&2
+        exit 1
+    fi
+fi
+
+composer install
+
 # avoid port collision on jenkins - use $EXECUTOR_NUMBER
 if [ -z "$EXECUTOR_NUMBER" ]; then
     EXECUTOR_NUMBER=0
@@ -27,15 +38,19 @@ echo $PHPPID_FED
 export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
-#Enable external storage app
-$OCC app:enable files_external
+if [ "$INSTALLED" == "true" ]; then
 
-mkdir -p work/local_storage
-OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage`
+    #Enable external storage app
+    $OCC app:enable files_external
 
-ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
+    mkdir -p work/local_storage
+    OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage`
 
-$OCC files_external:option $ID_STORAGE enable_sharing true
+    ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
+
+    $OCC files_external:option $ID_STORAGE enable_sharing true
+
+fi
 
 vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
 RESULT=$?
@@ -43,13 +58,16 @@ RESULT=$?
 kill $PHPPID
 kill $PHPPID_FED
 
-$OCC files_external:delete -y $ID_STORAGE
+if [ "$INSTALLED" -eq "true" ]; then
 
-#Disable external storage app
-$OCC app:disable files_external
+    $OCC files_external:delete -y $ID_STORAGE
+
+    #Disable external storage app
+    $OCC app:disable files_external
+fi
 
 if [ -z $HIDE_OC_LOGS ]; then
-	tail "${OC_PATH}/data/owncloud.log"
+	tail "${OC_PATH}/data/nextcloud.log"
 fi
 
 echo "runsh: Exit code: $RESULT"