fix: tests

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>

.github/workflows/test.yml

@@ -11,19 +11,15 @@ env:
   TEST_SERVER_REPOSITORY: ${{ vars.TEST_SERVER_REPOSITORY || 'Nodarx/server' }}
   TEST_SERVER_REF: ${{ vars.TEST_SERVER_REF || 'main' }}
   TEST_GIT_SERVER_URL: ${{ vars.TEST_GIT_SERVER_URL || 'https://git.ktrix.dev' }}
-  TEST_DATABASE_URI: ${{ vars.TEST_DATABASE_URI || 'mongodb://mongo:27017/?tls=false' }}
 
 jobs:
   test-node:
     name: Test Node
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with Node.js (npm)
-        id: install
         uses: ./
         with:
           install-node: 'true'
@@ -40,20 +36,20 @@ jobs:
           test -d ./test-server/node_modules || exit 1
           chmod +x ./scripts/health-check.sh
           ./scripts/health-check.sh ./test-server true false false
-          test "${{ steps.install.outputs.install-status }}" = "success"
-          test "${{ steps.install.outputs.node-installed }}" = "true"
           echo "✓ Node.js (npm) installation successful"
+      
+      - name: Run server tests
+        run: |
+          cd ./test-server
+          npm run test:unit
 
   test-php:
     name: Test PHP
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with PHP
-        id: install
         uses: ./
         with:
           install-php: 'true'
@@ -71,17 +67,23 @@ jobs:
           composer --version
           chmod +x ./scripts/health-check.sh
           ./scripts/health-check.sh ./test-server false true false
-          test "${{ steps.install.outputs.install-status }}" = "success"
-          test "${{ steps.install.outputs.php-installed }}" = "true"
           echo "✓ PHP installation successful"
+      
+      - name: Run server tests
+        run: |
+          cd ./test-server
+          composer test:unit
 
   test-database-config:
     name: Test Database Configuration
     runs-on: ubuntu-latest
+    services:
+      mongo:
+        image: mongo:7
+        ports:
+          - 27017:27017
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
 
       - name: Test action with database configuration
         uses: ./
@@ -89,7 +91,7 @@ jobs:
           install-php: 'true'
           php-version: '8.5'
           server-path: './test-server'
-          database-uri: ${{ env.TEST_DATABASE_URI }}
+          database-uri: 'mongodb://127.0.0.1:27017/?tls=false'
           database-name: 'ktrix_ci'
           app-environment: 'test'
           server-repository: ${{ env.TEST_SERVER_REPOSITORY }}
@@ -105,32 +107,35 @@ jobs:
             $uri = $config["database"]["uri"] ?? null;
             $name = $config["database"]["database"] ?? null;
             $env = $config["environment"] ?? null;
-            $expectedUri = getenv("TEST_DATABASE_URI");
-            if ($uri !== $expectedUri) { fwrite(STDERR, "database.uri not overridden, got: $uri\n"); exit(1); }
+            if ($uri !== "mongodb://127.0.0.1:27017/?tls=false") { fwrite(STDERR, "database.uri not overridden, got: $uri\n"); exit(1); }
             if ($name !== "ktrix_ci") { fwrite(STDERR, "database.database not overridden, got: $name\n"); exit(1); }
             if ($env !== "test") { fwrite(STDERR, "environment not overridden, got: $env\n"); exit(1); }
           '
           echo "✓ Database configuration verified"
 
+      - name: Verify database is reachable with configured settings
+        run: |
+          cd ./test-server
+          php bin/console tenant:list
+
   test-base-modules:
     name: Test Base Modules Installation
     runs-on: ubuntu-latest
     services:
       mongo:
         image: mongo:7
+        ports:
+          - 27017:27017
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
 
       - name: Test action with base modules
-        id: install
         uses: ./
         with:
           install-php: 'true'
           php-version: '8.5'
           server-path: './test-server'
-          database-uri: ${{ env.TEST_DATABASE_URI }}
+          database-uri: 'mongodb://127.0.0.1:27017/?tls=false'
           database-name: 'ktrix_ci'
           install-base-modules: 'true'
           server-repository: ${{ env.TEST_SERVER_REPOSITORY }}
@@ -140,34 +145,54 @@ jobs:
 
       - name: Verify password authentication provider is installed and enabled
         run: |
-          test -d ./test-server/modules/authentication_provider_password
-          test "${{ steps.install.outputs.install-status }}" = "success"
-          test "${{ steps.install.outputs.base-modules-installed }}" = "true"
+          cd ./test-server
+          OUTPUT=$(php bin/console module:list)
+          echo "$OUTPUT"
+          echo "$OUTPUT" | grep -q "authentication_provider_password" || { echo "::error::authentication_provider_password not found in module list"; exit 1; }
+          echo "$OUTPUT" | grep "authentication_provider_password" | grep -q "Enabled" || { echo "::error::authentication_provider_password is not enabled"; exit 1; }
           echo "✓ authentication_provider_password is installed and enabled"
 
+      - name: Verify a tenant and user can be provisioned end-to-end
+        run: |
+          cd ./test-server
+          php bin/console tenant:create ci.test --identifier ci_smoke
+          php bin/console user:create ci_smoke tester@ci.test
+          php bin/console user:password ci_smoke tester@ci.test 'Sup3r-Secret!'
+          php bin/console user:list ci_smoke | grep -q "tester@ci.test" || { echo "::error::provisioned user not found"; exit 1; }
+          echo "✓ tenant and user provisioning verified"
+
   test-base-modules-requires-php:
     name: Test Base Modules Requires PHP
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
 
-      - name: Verify base modules require PHP
+      - name: Expect failure when install-base-modules is set without install-php
+        id: expect-failure
+        continue-on-error: true
+        uses: ./
+        with:
+          install-node: 'true'
+          install-base-modules: 'true'
+          server-path: './test-server'
+          server-repository: ${{ env.TEST_SERVER_REPOSITORY }}
+          server-ref: ${{ env.TEST_SERVER_REF }}
+          github-server-url: ${{ env.TEST_GIT_SERVER_URL }}
+          checkout-token: ${{ secrets.TEST_SERVER_TOKEN }}
+
+      - name: Verify the action failed
         run: |
-          if bash ./scripts/validate-inputs.sh true false false true; then
-            echo "::error::Expected validation to fail when install-base-modules is set without install-php"
+          if [ "${{ steps.expect-failure.outcome }}" != "failure" ]; then
+            echo "::error::Expected action to fail when install-base-modules is set without install-php"
             exit 1
           fi
-          echo "✓ Validation correctly rejected install-base-modules without install-php"
+          echo "✓ Action correctly rejected install-base-modules without install-php"
 
   test-nginx:
     name: Test nginx
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with nginx
         uses: ./
@@ -193,12 +218,9 @@ jobs:
     name: Test All Components
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with all components
-        id: install
         uses: ./
         with:
           install-node: 'true'
@@ -223,22 +245,24 @@ jobs:
           nginx -v
           chmod +x ./scripts/health-check.sh
           ./scripts/health-check.sh ./test-server true true true
-          test "${{ steps.install.outputs.install-status }}" = "success"
-          test "${{ steps.install.outputs.node-installed }}" = "true"
-          test "${{ steps.install.outputs.php-installed }}" = "true"
-          test "${{ steps.install.outputs.nginx-installed }}" = "true"
           echo "✓ All components installation successful"
+      
+      - name: Run integration tests
+        run: |
+          cd ./test-server
+          if [ -f package.json ] && grep -q '"test:integration"' package.json; then
+            npm run test:integration
+          else
+            echo "⚠ No integration test script configured, skipping"
+          fi
 
   test-custom-paths:
     name: Test Custom Server Path
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with custom path
-        id: install
         uses: ./
         with:
           install-node: 'true'
@@ -252,17 +276,22 @@ jobs:
         run: |
           test -d ./my-custom-server || exit 1
           test -d ./my-custom-server/node_modules || exit 1
-          test "${{ steps.install.outputs.install-path }}" = "./my-custom-server"
-          test "${{ steps.install.outputs.install-status }}" = "success"
           echo "✓ Custom path installation successful"
+      
+      - name: Run server tests
+        run: |
+          cd ./my-custom-server
+          if [ -f package.json ] && grep -q '"test"' package.json; then
+            npm test
+          else
+            echo "⚠ No test script configured, skipping"
+          fi
 
   test-build-command:
     name: Test Build Command
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v6.0.2
       
       - name: Test action with build command
         uses: ./
@@ -278,6 +307,4 @@ jobs:
       - name: Verify build
         run: |
           cd ./test-server
-          test -f build.log
-          grep -q '^Build complete$' build.log
-          echo "✓ Custom build command completed successfully"
+          npm run dev

README.md

@@ -223,11 +223,7 @@ Overrides are written into the checked-out `config/system.php`. Requires `instal
 
 ### Base Modules
 
-Clones the configured module repository directly, then installs and enables the
-module via `bin/console`. This avoids a nested remote-action dependency, so the
-action works on GitHub-compatible hosts without resolving
-`Nodarx/action-module-install` through GitHub. Requires `install-php` and a
-reachable, configured database.
+Delegates cloning to [action-module-install](https://git.ktrix.dev/Nodarx/action-module-install), then installs and enables the module via `bin/console`. Requires `install-php` and a reachable, configured database.
 
 | Input | Description | Required | Default |
 |-------|-------------|----------|---------|
@@ -246,18 +242,10 @@ To test another source without editing the workflow, set:
 | `TEST_SERVER_REPOSITORY` | Repository in `owner/name` form | `Nodarx/server` |
 | `TEST_SERVER_REF` | Branch, tag, or commit | `main` |
 | `TEST_GIT_SERVER_URL` | Base URL of the GitHub-compatible server | `https://git.ktrix.dev` |
-| `TEST_DATABASE_URI` | MongoDB service URI used by database tests | `mongodb://mongo:27017/?tls=false` |
 
 For a private source, also add a repository secret named
 `TEST_SERVER_TOKEN`. Public repositories do not require the secret.
 
-Gitea Actions runs the job and service containers separately. Workflows that
-declare a MongoDB service named `mongo` must therefore pass
-`database-uri: mongodb://mongo:27017/?tls=false`; `127.0.0.1` points to the job
-container, not the MongoDB service. On runner setups where services are
-published directly onto the host, override `TEST_DATABASE_URI` with the
-appropriate host address.
-
 ## Outputs
 
 | Output | Description |

action.yml

@@ -123,12 +123,20 @@ runs:
       shell: bash
       run: |
         echo "::group::Validating inputs"
+        
+        # Validate at least one component is enabled
+        if [ "${{ inputs.install-node }}" != "true" ] && \
+           [ "${{ inputs.install-php }}" != "true" ] && \
+           [ "${{ inputs.install-nginx }}" != "true" ]; then
+          echo "::error::At least one component must be enabled (install-node, install-php, or install-nginx)"
+          exit 1
+        fi
 
-        bash "${{ github.action_path }}/scripts/validate-inputs.sh" \
-          "${{ inputs.install-node }}" \
-          "${{ inputs.install-php }}" \
-          "${{ inputs.install-nginx }}" \
-          "${{ inputs.install-base-modules }}"
+        # install-base-modules requires PHP (it runs bin/console)
+        if [ "${{ inputs.install-base-modules }}" == "true" ] && [ "${{ inputs.install-php }}" != "true" ]; then
+          echo "::error::install-base-modules requires install-php to be 'true'"
+          exit 1
+        fi
 
         echo "Server path: ${{ inputs.server-path }}"
         echo "Components to install:"
@@ -140,7 +148,7 @@ runs:
 
     - name: Checkout server repository (public/no token)
       if: inputs.checkout-token == ''
-      uses: actions/checkout@v6.0.2
+      uses: actions/checkout@v4
       with:
         repository: ${{ inputs.server-repository }}
         ref: ${{ inputs.server-ref }}
@@ -148,11 +156,10 @@ runs:
         fetch-depth: 1
         submodules: recursive
         github-server-url: ${{ inputs.github-server-url }}
-        persist-credentials: false
 
     - name: Checkout server repository (with token)
       if: inputs.checkout-token != ''
-      uses: actions/checkout@v6.0.2
+      uses: actions/checkout@v4
       with:
         repository: ${{ inputs.server-repository }}
         ref: ${{ inputs.server-ref }}
@@ -161,7 +168,6 @@ runs:
         submodules: recursive
         github-server-url: ${{ inputs.github-server-url }}
         token: ${{ inputs.checkout-token }}
-        persist-credentials: false
 
     - name: Setup Node
       if: inputs.install-node == 'true'
@@ -262,27 +268,17 @@ runs:
 
     - name: Clone base modules
       if: inputs.install-base-modules == 'true'
-      shell: bash
-      env:
-        MODULE_REPOSITORY: ${{ inputs.base-modules-repository }}
-        MODULE_REF: ${{ inputs.base-modules-branch }}
-        MODULE_PATH: ${{ inputs.server-path }}/modules/authentication_provider_password
-      run: |
-        echo "::group::Cloning base modules"
-
-        if [ -e "$MODULE_PATH" ]; then
-          echo "::error::Base module path already exists: $MODULE_PATH"
-          exit 1
-        fi
-
-        mkdir -p "$(dirname "$MODULE_PATH")"
-        git init "$MODULE_PATH"
-        git -C "$MODULE_PATH" remote add origin "$MODULE_REPOSITORY"
-        git -C "$MODULE_PATH" fetch --depth 1 origin "$MODULE_REF"
-        git -C "$MODULE_PATH" checkout --detach FETCH_HEAD
-
-        echo "✓ Base modules cloned"
-        echo "::endgroup::"
+      uses: Nodarx/action-module-install@main
+      with:
+        modules: |
+          [
+            {
+              "name": "authentication_provider_password",
+              "repo": "${{ inputs.base-modules-repository }}",
+              "branch": "${{ inputs.base-modules-branch }}"
+            }
+          ]
+        install-path: ${{ inputs.server-path }}/modules
 
     - name: Install and enable base modules
       if: inputs.install-base-modules == 'true'

scripts/validate-inputs.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-install_node="${1:-false}"
-install_php="${2:-false}"
-install_nginx="${3:-false}"
-install_base_modules="${4:-false}"
-
-if [ "$install_node" != "true" ] &&
-   [ "$install_php" != "true" ] &&
-   [ "$install_nginx" != "true" ]; then
-  echo "::error::At least one component must be enabled (install-node, install-php, or install-nginx)"
-  exit 1
-fi
-
-if [ "$install_base_modules" = "true" ] && [ "$install_php" != "true" ]; then
-  echo "::error::install-base-modules requires install-php to be 'true'"
-  exit 1
-fi