WIP

Author: lennartdohmann

.devcontainer/devcontainer.json

@@ -2,7 +2,8 @@
   "name": "PHP",
   "image": "mcr.microsoft.com/devcontainers/php:1-8.4-bullseye",
   "forwardPorts": [
-    8080
+    8080,
+    8081
   ],
   "customizations": {
     "vscode": {

Makefile

@@ -80,7 +80,7 @@ unittests:
 # Run bats tests
 .PHONY: bats
 bats:
-	./run-app.sh "31.0.8" 1
+	./scripts/run-app.sh "31.0.8" 1
 	bats --verbose-run --timing --trace ./tests/bats
 
 # Same as clean but also removes dependencies and build related folders

empty-skeleton.config.php

@@ -0,0 +1,10 @@
+<?php
+
+// SPDX-FileCopyrightText: 2025 Lennart Dohmann <lennart.dohmann@gdata.de>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+$CONFIG = [
+	'skeletondirectory' => '',
+	'debug' => true,
+];

scripts/run-app.sh

@@ -18,6 +18,8 @@ fi
 source .env || echo "No .env file found."
 
 setup_nextcloud () {
+  docker stop nextcloud-container || true
+  docker container rm nextcloud-container || true
   docker compose -f docker-compose.yaml kill
   docker compose -f docker-compose.yaml rm --force --stop --volumes
   docker compose -f docker-compose.yaml up --build --quiet-pull --wait -d --force-recreate --renew-anon-volumes --remove-orphans
@@ -28,6 +30,10 @@ setup_nextcloud () {
     sleep 2
   done
 
+  echo "copy config for empty skeleton"
+  docker cp ./empty-skeleton.config.php nextcloud-container:/var/www/html/config/config.php
+  docker exec -i nextcloud-container chown www-data:www-data /var/www/html/config/config.php
+
   until docker exec --user www-data -i nextcloud-container php occ maintenance:install --admin-user=admin --admin-pass=admin | grep "Nextcloud was successfully installed"
   do
     echo "Waiting for installation to finish..."

tests/bats/.env-test

@@ -14,7 +14,7 @@ fi
 if [[ "$IS_CI" == "true" ]]; then
     export MAIL_HOSTNAME=smtp
 else
-    export MAIL_HOSTNAME=127.0.0.1:8001
+    export MAIL_HOSTNAME=127.0.0.1:8081
 fi
 
 export FOLDER_PREFIX=./tmp/functionality-parallel

tests/bats/functionality-parallel.bats

@@ -6,7 +6,7 @@
 
 setup_file() {
     source tests/bats/.env-test || return 1
-    source .env-local || echo "No .env-local file found."
+    source .env-local || source .env || echo "No .env files found."
     mkdir -p $FOLDER_PREFIX
     curl --output $FOLDER_PREFIX/pup.exe http://amtso.eicar.org/PotentiallyUnwanted.exe
     $DOCKER_EXEC_WITH_USER --env OC_PASS=$TESTUSER_PASSWORD nextcloud-container php occ user:add $TESTUSER --password-from-env || echo "already exists"
@@ -30,11 +30,6 @@ setup_file() {
 @test "test admin clean upload" {
     RESULT=$(echo $CLEAN_STRING | curl -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "curl failed")
 
-    if [[ "$RESULT" =~ "curl failed" ]]; then
-        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data/admin/files
-        docker logs nextcloud-container
-    fi
-
     echo "Actual: $RESULT"
     curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "file not found"
     [[ $RESULT -ge 200 && $RESULT -lt 300 ]]