Cleanup tests

Author: aguingand

tests/Http/Auth/AuthenticationTest.php

@@ -3,10 +3,11 @@
 use Code16\Sharp\Tests\Fixtures\Entities\PersonEntity;
 use Code16\Sharp\Tests\Fixtures\TestAuthGuard;
 use Code16\Sharp\Tests\Fixtures\User;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Contracts\Auth\Guard;
 
 beforeEach(function () {
     sharp()->config()->declareEntity(PersonEntity::class);
-    sharp()->config()->disableImpersonation();
 });
 
 function setTestAuthGuard(): void
@@ -117,7 +118,7 @@ function setTestAuthGuard(): void
 
 it('allows custom auth guard', function () {
     auth()->extend('test', function () {
-        return new class() implements \Illuminate\Contracts\Auth\Guard
+        return new class() implements Guard
         {
             protected $user;
 
@@ -148,7 +149,7 @@ public function hasUser()
                 return $this->user !== null;
             }
 
-            public function setUser(\Illuminate\Contracts\Auth\Authenticatable $user)
+            public function setUser(Authenticatable $user)
             {
                 $this->user = $user;
             }

tests/Http/Auth/AuthorizationsTest.php

@@ -17,7 +17,6 @@
 beforeEach(function () {
     login();
     sharp()->config()->declareEntity(PersonEntity::class);
-    sharp()->config()->disableImpersonation();
 });
 
 it('allows to configure prohibited actions on entities', function () {

tests/Http/Auth/ImpersonateTest.php

@@ -4,9 +4,16 @@
 use Code16\Sharp\Auth\Impersonate\SharpImpersonationHandler;
 use Code16\Sharp\Tests\Fixtures\User;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Schema;
 use Inertia\Testing\AssertableInertia as Assert;
 
+use function Orchestra\Testbench\Pest\defineEnvironment;
+
+defineEnvironment(function () {
+    sharp()->config()->enableImpersonation();
+});
+
 function migrateUsersTable()
 {
     Schema::create('users', function (Blueprint $table) {
@@ -38,7 +45,7 @@ public function getUsers(): array
 
 it('redirects to impersonation page if authenticated as non admin user', function () {
     migrateUsersTable();
-    \Illuminate\Support\Facades\Gate::define('viewSharp', fn ($user) => false);
+    Gate::define('viewSharp', fn ($user) => false);
 
     sharp()->config()->enableImpersonation(new class() extends SharpImpersonationHandler
     {
@@ -137,6 +144,7 @@ public function getUsers(): array
     });
 
     sharp()->config()->disableImpersonation();
+
     $this->get(route('code16.sharp.impersonate'))
         ->assertInertia(fn (Assert $page) => $page
             ->where('impersonateUsers', null)

tests/Http/Auth/PasswordResetEloquentTest.php

@@ -9,8 +9,14 @@
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Schema;
 
+use function Orchestra\Testbench\Pest\defineEnvironment;
+
 uses(LazilyRefreshDatabase::class);
 
+defineEnvironment(function () {
+    sharp()->config()->enableForgottenPassword();
+});
+
 beforeEach(function () {
     $this->withoutExceptionHandling();
     Notification::fake();

tests/Http/Auth/PasswordResetTest.php

@@ -4,7 +4,9 @@
 
 use Code16\Sharp\Tests\Fixtures\TestPasswordBroker;
 
-beforeEach(function () {
+use function Orchestra\Testbench\Pest\defineEnvironment;
+
+defineEnvironment(function () {
     sharp()->config()->enableForgottenPassword(broker: TestPasswordBroker::class);
 });
 

tests/TestCase.php

@@ -6,10 +6,8 @@
 use BladeUI\Icons\Factory;
 use Code16\ContentRenderer\ContentRendererServiceProvider;
 use Code16\Sharp\SharpInternalServiceProvider;
-use Illuminate\Testing\Fluent\AssertableJson;
 use Orchestra\Testbench\Pest\WithPest;
 use Orchestra\Testbench\TestCase as Orchestra;
-use PHPUnit\Framework\Assert as PHPUnit;
 
 class TestCase extends Orchestra
 {
@@ -20,30 +18,9 @@ protected function setUp(): void
         parent::setUp();
 
         $this->withoutVite();
-
-        config()->set('app.key', 'base64:'.base64_encode(random_bytes(32)));
-        config()->set('view.cache', false);
-        config()->set('inertia.testing.page_paths', [__DIR__.'/../resources/js/Pages']);
-
-        // laravel 11 polyfill, TODO to remove when laravel 12+ only
-        AssertableJson::macro('whereNull', function ($key) {
-            $this->has($key);
-
-            $actual = $this->prop($key);
-
-            PHPUnit::assertNull(
-                $actual,
-                sprintf(
-                    'Property [%s] should be null.',
-                    $this->dotPath($key),
-                )
-            );
-
-            return $this;
-        });
     }
 
-    protected function getPackageProviders($app)
+    protected function getPackageProviders($app): array
     {
         return [
             SharpInternalServiceProvider::class,
@@ -52,20 +29,18 @@ protected function getPackageProviders($app)
         ];
     }
 
-    public function getEnvironmentSetUp($app)
+    public function defineEnvironment($app): void
     {
-        config()->set('database.default', 'testing');
+        $app['config']->set('app.key', 'base64:'.base64_encode(random_bytes(32)));
+        $app['config']->set('view.cache', false);
+        $app['config']->set('inertia.testing.page_paths', [__DIR__.'/../resources/js/Pages']);
+        $app['config']->set('database.default', 'testing');
+
+        $app['view']->addNamespace('fixtures', __DIR__.'/Fixtures/resources/views');
 
         $app->make(Factory::class)->add('testicon', [
             'path' => __DIR__.'/Fixtures/resources/svg',
             'prefix' => 'testicon',
         ]);
-
-        $app->make('view')->addNamespace('fixtures', __DIR__.'/Fixtures/resources/views');
-
-        // We have to set these two because otherwise corresponding routes won't be loaded at all
-        sharp()->config()
-            ->enableForgottenPassword()
-            ->enableImpersonation();
     }
 }

tests/Unit/Console/GeneratorTest.php

@@ -7,6 +7,9 @@
 
 beforeEach(function () {
     login();
+});
+
+afterEach(function () {
     File::deleteDirectory(base_path('app/Sharp'));
 });
 
@@ -112,7 +115,7 @@
         ->assertExitCode(0);
 
     // Manually add this new Entity to the Sharp config
-    app(\Code16\Sharp\Config\SharpConfigBuilder::class)
+    app(SharpConfigBuilder::class)
         ->addEntity('settings', '\App\Sharp\Entities\SettingsEntity');
 
     $this->get(