chore(testing): run flarum/testing packages tests back again

.github/workflows/backend.yml

@@ -8,4 +8,4 @@ jobs:
     with:
       enable_backend_testing: true
       backend_directory: .
-      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages"
+      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"

composer.json

@@ -172,7 +172,8 @@
         "phpunit/phpunit": "^11.0",
         "phpstan/phpstan": "^1.10.0",
         "larastan/larastan": "2.9.12",
-        "symfony/var-dumper": "^7.0"
+        "symfony/var-dumper": "^7.0",
+        "flarum/testing-tests": "*@dev"
     },
     "config": {
         "sort-packages": true
@@ -217,5 +218,11 @@
     },
     "scripts-descriptions": {
         "analyse:phpstan": "Run static analysis"
-    }
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "php-packages/testing/tests"
+        }
+    ]
 }

php-packages/testing/composer.json

@@ -13,7 +13,8 @@
         "phpunit/phpunit": "^11.0"
     },
     "require-dev": {
-        "flarum/core": "*@dev"
+        "flarum/core": "*@dev",
+        "flarum/testing-tests": "*@dev"
     },
     "autoload": {
         "psr-4": {
@@ -30,10 +31,16 @@
             "dev-main": "2.x-dev"
         }
     },
-    "repositories": [{
+    "repositories": [
+        {
             "type": "path",
             "url": "../../*/*"
-        }],
+        },
+        {
+            "type": "path",
+            "url": "tests"
+        }
+    ],
     "minimum-stability": "dev",
     "prefer-stable": true
 }

php-packages/testing/src/integration/Extension/ExtensionManagerIncludeCurrent.php

@@ -12,6 +12,7 @@
 use Flarum\Database\Migrator;
 use Flarum\Extension\Extension;
 use Flarum\Extension\ExtensionManager;
+use Flarum\Foundation\Config;
 use Flarum\Foundation\MaintenanceMode;
 use Flarum\Foundation\Paths;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -99,9 +100,13 @@ protected function setEnabledExtensions(array $enabledExtensions): void
      */
     protected function getAssetsFilesystem(): Cloud
     {
+        /** @var Config $config */
+        $config = $this->container->make(Config::class);
         $adapter = new LocalFilesystemAdapter($this->paths->public.'/assets');
 
-        return new FilesystemAdapter(new \League\Flysystem\Filesystem($adapter), $adapter);
+        return new FilesystemAdapter(new \League\Flysystem\Filesystem($adapter), $adapter, [
+            'url' => $config->url().'/assets',
+        ]);
     }
 
     protected function includeCurrentExtension(Collection $extensions, $package, string $packagePath): Collection

php-packages/testing/tests/.gitignore

@@ -1 +1,2 @@
-vendor/*
+vendor/*
+tests/.*.cache

php-packages/testing/tests/composer.json

@@ -3,7 +3,7 @@
   "description": "Minimal extension to test the flarum/testing package",
   "type": "flarum-extension",
   "require": {
-    "flarum/core": "^0.1.0@dev"
+    "flarum/core": "^2.0@dev"
   },
   "require-dev": {
     "flarum/testing": "*@dev"
@@ -13,6 +13,17 @@
       "Flarum\\Testing\\Tests\\": "tests/"
     }
   },
+    "extra": {
+        "flarum-extension": {
+            "title": "Testing",
+            "category": "feature",
+            "icon": {
+                "name": "fas fa-vial",
+                "backgroundColor": "#ABDC88",
+                "color": "#3F8A32"
+            }
+        }
+    },
   "scripts": {
     "test": [
       "@test:unit",

php-packages/testing/tests/tests/integration/TestCaseTest.php

@@ -10,17 +10,18 @@
 namespace Flarum\Testing\Tests\integration;
 
 use Flarum\Extend;
+use Flarum\Extension\ExtensionManager;
 use Flarum\Foundation\Config;
+use Flarum\Settings\DefaultSettingsRepository;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
 use Illuminate\Database\Schema\Builder;
+use PHPUnit\Framework\Attributes\Test;
 
 class TestCaseTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function admin_user_created_as_part_of_default_state()
     {
         $this->app();
@@ -34,9 +35,7 @@ public function admin_user_created_as_part_of_default_state()
         $this->assertTrue($user->isAdmin());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_add_settings_via_method()
     {
         $this->setting('hello', 'world');
@@ -48,20 +47,17 @@ public function can_add_settings_via_method()
         $this->assertEquals('something_other_than_username', $settings->get('display_name_driver'));
     }
 
-    /**
-     * @test
-     */
+   #[Test]
     public function settings_cleaned_up_from_previous_method()
     {
         $settings = $this->app()->getContainer()->make(SettingsRepositoryInterface::class);
+        $defaults = $this->app()->getContainer()->make(DefaultSettingsRepository::class);
 
         $this->assertEquals(null, $settings->get('hello'));
-        $this->assertEquals(null, $settings->get('display_name_driver'));
+        $this->assertEquals($defaults->get('display_name_driver'), $settings->get('display_name_driver'));
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_add_config_via_method()
     {
         $this->config('hello', 'world');
@@ -75,9 +71,7 @@ public function can_add_config_via_method()
         $this->assertEquals('value', $config['level1']['level2']);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function config_cleaned_up_from_previous_method()
     {
         $config = $this->app()->getContainer()->make(Config::class);
@@ -87,9 +81,7 @@ public function config_cleaned_up_from_previous_method()
         $this->assertFalse(isset($config['level1']['level2']));
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function current_extension_not_applied_by_default()
     {
         $response = $this->send(
@@ -99,9 +91,7 @@ public function current_extension_not_applied_by_default()
         $this->assertStringNotContainsString('notARealSetting', $response->getBody()->getContents());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function current_extension_applied_if_specified()
     {
         $this->extension('flarum-testing-tests');
@@ -113,9 +103,7 @@ public function current_extension_applied_if_specified()
         $this->assertStringContainsString('notARealSetting', $response->getBody()->getContents());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function current_extension_migrations_applied_if_specified()
     {
         $this->extension('flarum-testing-tests');
@@ -124,9 +112,7 @@ public function current_extension_migrations_applied_if_specified()
         $this->assertTrue($tableExists);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function current_extension_considered_enabled_after_boot()
     {
         $this->extension('flarum-testing-tests');
@@ -135,9 +121,7 @@ public function current_extension_considered_enabled_after_boot()
         $this->assertTrue($enabled);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_apply_extenders()
     {
         $this->extend(
@@ -151,9 +135,7 @@ public function can_apply_extenders()
         $this->assertStringContainsString('notARealSetting', $response->getBody()->getContents());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function can_apply_route_extenders()
     {
         $this->extend(
@@ -167,9 +149,7 @@ public function can_apply_route_extenders()
         $this->assertEquals(200, $response->getStatusCode());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function routes_added_by_current_extension_not_accessible_by_default()
     {
         $response = $this->send(
@@ -179,9 +159,7 @@ public function routes_added_by_current_extension_not_accessible_by_default()
         $this->assertEquals(404, $response->getStatusCode());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function routes_added_by_current_extension_accessible()
     {
         $this->extension('flarum-testing-tests');
@@ -193,14 +171,13 @@ public function routes_added_by_current_extension_accessible()
         $this->assertEquals(200, $response->getStatusCode());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function extension_url_correct()
     {
         $this->extension('flarum-testing-tests');
         $expected = $this->app()->getContainer()->make('filesystem')->disk('flarum-assets')->url('/flarum-testing-tests/');
         // We need to test this since we override it.
+        /** @var ExtensionManager $extensions */
         $extensions = $this->app()->getContainer()->make('flarum.extensions');
         $currExtension = $extensions->getExtension('flarum-testing-tests');
         $baseAssetsUrl = $extensions->getAsset($currExtension, '');

php-packages/testing/tests/tests/integration/setup.php

@@ -7,6 +7,6 @@
  * LICENSE file that was distributed with this source code.
  */
 
-$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
+$setup = require __DIR__.'/../../../bootstrap/monorepo.php';
 
 $setup->run();

php-packages/testing/tests/tests/phpunit.integration.xml

@@ -8,7 +8,7 @@
     colors="true"
     processIsolation="true"
     stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
+    bootstrap="../../bootstrap/monorepo.php"
 >
     <source>
         <include>

php-packages/testing/tests/tests/phpunit.unit.xml

@@ -8,7 +8,7 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
+    bootstrap="../../bootstrap/monorepo.php"
 >
     <source>
         <include>