♻️ Update routing tests to work with Sage theme

- Refactor routing tests from mu-plugin approach to Sage theme integration
- Add proper backup/restore of Sage functions.php with cleanup in tearDown
- Add COMPOSER_ROOT_VERSION env var to handle version constraints cleanly
- Update GitHub Actions to test with Sage theme activation

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: retlehs

.devcontainer/docker-compose.yml

@@ -13,6 +13,7 @@ services:
       XDEBUG_MODE: '${XDEBUG_MODE:-develop,debug}'
       XDEBUG_CONFIG: '${XDEBUG_CONFIG:-client_port=9003 client_host=host.docker.internal discover_client_host=true}'
       REPOSITORY_URL: '${REPOSITORY_URL:-https://github.com/roots/bedrock.git}'
+      COMPOSER_ROOT_VERSION: '5.0.x-dev'
     volumes:
       - ~/.ssh:/home/vscode/.ssh:ro
       - 'app:/roots/app'

.devcontainer/install.sh

@@ -102,7 +102,7 @@ sudo chmod g+w -R /roots/app
 cd /roots
 
 # wp-cli.yml file
-cat <<WPCLI > /roots/wp-cli.yml
+sudo tee /roots/wp-cli.yml > /dev/null <<WPCLI
 path: /roots/app/public/wp
 server:
   docroot: /roots/app/public

.devcontainer/setup.sh

@@ -36,9 +36,13 @@ fi
 wp db reset --yes
 wp core install --url="${WP_HOME}" --title="${WP_SITE_TITLE}" --admin_user="admin" --admin_email="[email protected]" --admin_password="password" --skip-email
 
-# Add sage if there are no themes
-if [ ! "$(ls -d $(wp theme path --skip-plugins --skip-themes 2>/dev/null)/*/)" ]; then
-    composer require -d /roots/app roots/sage
+# Add sage if it's not active
+if ! wp theme status sage --skip-plugins --skip-themes 2>/dev/null | grep -q "^sage.*active"; then
+    cd /roots/app
+    # Only require sage if it doesn't exist
+    if ! wp theme is-installed sage --skip-plugins --skip-themes 2>/dev/null; then
+        composer require roots/sage -W
+    fi
     wp theme activate sage
     # Build the Sage theme
     cd $(wp theme path --skip-plugins --skip-themes 2>/dev/null)/sage

.github/workflows/integration.yml

@@ -17,20 +17,18 @@ jobs:
         with:
           configFile: .devcontainer/devcontainer.json
           runCmd: |
-            cd /roots/app
-            composer install
-            # ???
-            composer remove roots/acorn
-            composer require roots/acorn --no-interaction
-            composer require --dev nunomaduro/collision
-            composer require --dev spatie/laravel-ignition
-            # ???
+            # Wait for database to be ready
             while ! mysqladmin ping -h"database" --silent; do
               sleep 1
             done
-            wp core install --url=http://web:8080 --title=Acorn --admin_user=admin --admin_password=admin [email protected] --skip-email --allow-root
+            # Ensure WordPress is installed
+            cd /roots/app
+            wp core install --url=http://web:8080 --title="Acorn Testing" --admin_user=admin --admin_password=password [email protected] --skip-email --allow-root
+            # Ensure Sage theme is activated
+            wp theme activate sage
+            # Clear optimization cache
             wp acorn optimize:clear
-
+            # Run the routing integration tests
             cd /roots/acorn
             composer install
             composer run-script test tests/Integration/Routing

tests/Integration/Routing/RoutingTest.php

@@ -43,7 +43,7 @@
 
     $response = $client->request('GET', 'http://web:8080/non-existent-'.time());
     expect($response->getStatusCode())->toBe(404);
-    expect((string) $response->getBody())->toContain('Page not found');
+    expect((string) $response->getBody())->toContain('Not Found');
     expect((string) $response->getBody())->toHaveBodyClass('error404');
 });
 

tests/Integration/Routing/RoutingTestCase.php

@@ -13,60 +13,62 @@ class RoutingTestCase extends MockeryTestCase
     use SupportsGlobalStubs;
     use SupportsScopedFixtures;
 
+    private $originalFunctionsContent;
+    private $functionsFile = '/roots/app/public/content/themes/sage/functions.php';
+    private $routesFile = '/roots/app/public/content/themes/sage/routes/web.php';
+
     protected function setUp(): void
     {
         parent::setUp();
         $this->clearStubs();
 
-        // Ensure routes directory exists
-        if (! is_dir('/roots/app/public/routes')) {
-            mkdir('/roots/app/public/routes', 0777, true);
+        // Ensure Sage routes directory exists
+        $routesDir = dirname($this->routesFile);
+        if (! is_dir($routesDir)) {
+            mkdir($routesDir, 0777, true);
         }
 
-        // Create web.php routes file
+        // Create test routes file
         $webRoutes = <<<'PHP'
 <?php
 
 use Illuminate\Support\Facades\Route;
 
-Route::middleware(['web'])->group(function () {
-    Route::get('/test', fn() => 'Howdy')->name('test');
-});
+Route::get('/test', fn() => 'Howdy')->name('test');
 PHP;
 
-        file_put_contents('/roots/app/public/routes/web.php', $webRoutes);
+        file_put_contents($this->routesFile, $webRoutes);
+
+        // Backup original functions.php and add routing
+        $this->originalFunctionsContent = file_get_contents($this->functionsFile);
 
-        // Ensure mu-plugins directory exists
-        if (! is_dir('/roots/app/public/content/mu-plugins')) {
-            mkdir('/roots/app/public/content/mu-plugins', 0777, true);
+        if (!str_contains($this->originalFunctionsContent, 'withRouting')) {
+            $newContent = str_replace(
+                '->boot();',
+                '->withRouting(web: __DIR__ . \'/routes/web.php\')' . "\n    ->boot();",
+                $this->originalFunctionsContent
+            );
+            file_put_contents($this->functionsFile, $newContent);
         }
 
-        // Create or update the Acorn boot mu-plugin
-        $bootPlugin = <<<'PHP'
-<?php
-/*
-Plugin Name: Acorn Boot
-*/
-
-use Roots\Acorn\Application;
-use Roots\Acorn\Configuration\Exceptions;
-use Roots\Acorn\Configuration\Middleware;
-
-add_action('after_setup_theme', function () {
-    Application::configure()
-        ->withMiddleware(function (Middleware $middleware) {
-            //
-        })
-        ->withExceptions(function (Exceptions $exceptions) {
-            //
-        })
-        ->withRouting(
-            web: '/roots/app/public/routes/web.php'
-        )
-        ->boot();
-}, 0);
-PHP;
+        // Ensure Sage is the active theme
+        if (function_exists('switch_theme')) {
+            switch_theme('sage');
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        // Restore original functions.php
+        if ($this->originalFunctionsContent) {
+            file_put_contents($this->functionsFile, $this->originalFunctionsContent);
+        }
+
+        // Clean up test routes file
+        if (file_exists($this->routesFile)) {
+            unlink($this->routesFile);
+        }
 
-        file_put_contents('/roots/app/public/content/mu-plugins/01-acorn-boot.php', $bootPlugin);
+        parent::tearDown();
     }
 }