Test Improvements (#1380)

* Test Improvements Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Sep 19, 2023 · 793b3d8 · 793b3d8
1 parent 83056da
commit 793b3d8
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 207 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "laravel/sanctum": "^3.0",
         "livewire/livewire": "^3.0",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.11",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^9.3"
     },

diff --git a/testbench.yaml b/testbench.yaml
@@ -0,0 +1,11 @@
+providers:
+  - Laravel\Fortify\FortifyServiceProvider
+  - Laravel\Jetstream\JetstreamServiceProvider
+  - Livewire\LivewireServiceProvider
+
+migrations:
+  - database/migrations
+  - vendor/laravel/fortify/database/migrations
+
+workbench:
+  install: false
diff --git a/tests/AddTeamMemberTest.php b/tests/AddTeamMemberTest.php
@@ -5,6 +5,7 @@
 use App\Actions\Jetstream\AddTeamMember;
 use App\Actions\Jetstream\CreateTeam;
 use App\Models\Team;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\ValidationException;
 use Laravel\Jetstream\Jetstream;
@@ -15,9 +16,11 @@
 
 class AddTeamMemberTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    use RefreshDatabase;
+
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Gate::policy(Team::class, TeamPolicy::class);
 
@@ -28,8 +31,6 @@ public function test_team_members_can_be_added()
     {
         Jetstream::role('admin', 'Admin', ['foo']);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $otherUser = User::forceCreate([
@@ -62,8 +63,6 @@ public function test_user_email_address_must_exist()
     {
         $this->expectException(ValidationException::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $action = new AddTeamMember;
@@ -77,8 +76,6 @@ public function test_user_cant_already_be_on_team()
     {
         $this->expectException(ValidationException::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $otherUser = User::forceCreate([
@@ -106,9 +103,4 @@ protected function createTeam()
 
         return $action->create($user, ['name' => 'Test Team']);
     }
-
-    protected function migrate()
-    {
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-    }
 }
diff --git a/tests/CreateTeamTest.php b/tests/CreateTeamTest.php
@@ -12,18 +12,16 @@
 
 class CreateTeamTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }
 
     public function test_team_name_can_be_updated()
     {
-        $this->migrate();
-
         $action = new CreateTeam;
 
         $user = User::forceCreate([
@@ -41,8 +39,6 @@ public function test_name_is_required()
     {
         $this->expectException(ValidationException::class);
 
-        $this->migrate();
-
         $action = new CreateTeam;
 
         $user = User::forceCreate([
@@ -53,11 +49,4 @@ public function test_name_is_required()
 
         $action->create($user, ['name' => '']);
     }
-
-    protected function migrate()
-    {
-        // $this->loadLaravelMigrations(['--database' => 'testbench']);
-
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-    }
 }
diff --git a/tests/CurrentTeamControllerTest.php b/tests/CurrentTeamControllerTest.php
@@ -11,18 +11,21 @@
 
 class CurrentTeamControllerTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
+
+        $app['config']->set([
+            'jetstream.stack' => 'livewire',
+            'jetstream.features' => ['teams'],
+        ]);
 
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }
 
     public function test_can_switch_to_team_the_user_belongs_to()
     {
-        $this->migrate();
-
         $action = new CreateTeam;
 
         $user = User::forceCreate([
@@ -43,8 +46,6 @@ public function test_can_switch_to_team_the_user_belongs_to()
 
     public function test_cant_switch_to_team_the_user_does_not_belong_to()
     {
-        $this->migrate();
-
         $action = new CreateTeam;
 
         $user = User::forceCreate([
@@ -65,17 +66,4 @@ public function test_cant_switch_to_team_the_user_does_not_belong_to()
 
         $response->assertStatus(403);
     }
-
-    protected function migrate()
-    {
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-    }
-
-    protected function getEnvironmentSetUp($app)
-    {
-        parent::getEnvironmentSetUp($app);
-
-        $app['config']->set('jetstream.stack', 'livewire');
-        $app['config']->set('jetstream.features', ['teams']);
-    }
 }
diff --git a/tests/DeleteTeamTest.php b/tests/DeleteTeamTest.php
@@ -15,18 +15,16 @@
 
 class DeleteTeamTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }
 
     public function test_team_can_be_deleted()
     {
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $action = new DeleteTeam;
@@ -40,8 +38,6 @@ public function test_team_deletion_can_be_validated()
     {
         Jetstream::useUserModel(User::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $action = new ValidateTeamDeletion;
@@ -57,8 +53,6 @@ public function test_personal_team_cant_be_deleted()
 
         Jetstream::useUserModel(User::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $team->forceFill(['personal_team' => true])->save();
@@ -74,8 +68,6 @@ public function test_non_owner_cant_delete_team()
 
         Jetstream::useUserModel(User::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $action = new ValidateTeamDeletion;
@@ -99,9 +91,4 @@ protected function createTeam()
 
         return $action->create($user, ['name' => 'Test Team']);
     }
-
-    protected function migrate()
-    {
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-    }
 }
diff --git a/tests/DeleteUserWithTeamsTest.php b/tests/DeleteUserWithTeamsTest.php
@@ -6,6 +6,7 @@
 use App\Actions\Jetstream\DeleteTeam;
 use App\Actions\Jetstream\DeleteUser;
 use App\Models\Team;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Schema;
@@ -16,18 +17,18 @@
 
 class DeleteUserWithTeamsTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    use RefreshDatabase;
+
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Gate::policy(Team::class, TeamPolicy::class);
         Jetstream::useUserModel(User::class);
     }
 
     public function test_user_can_be_deleted()
     {
-        $this->migrate();
-
         $team = $this->createTeam();
         $otherTeam = $this->createTeam();
 
@@ -64,10 +65,8 @@ protected function createTeam()
         return $action->create($user, ['name' => 'Test Team']);
     }
 
-    protected function migrate()
+    protected function afterRefreshingDatabase()
     {
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-
         Schema::create('personal_access_tokens', function ($table) {
             $table->id();
             $table->foreignId('tokenable_id');

diff --git a/tests/HasTeamsTest.php b/tests/HasTeamsTest.php
@@ -14,9 +14,9 @@ class HasTeamsTest extends OrchestraTestCase
 {
     use RefreshDatabase;
 
-    public function setUp(): void
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Jetstream::$permissions = [];
         Jetstream::$roles = [];

diff --git a/tests/InviteTeamMemberTest.php b/tests/InviteTeamMemberTest.php
@@ -14,9 +14,9 @@
 
 class InviteTeamMemberTest extends OrchestraTestCase
 {
-    public function setUp(): void
+    protected function defineEnvironment($app)
     {
-        parent::setUp();
+        parent::defineEnvironment($app);
 
         Gate::policy(Team::class, TeamPolicy::class);
 
@@ -29,8 +29,6 @@ public function test_team_members_can_be_invited()
 
         Jetstream::role('admin', 'Admin', ['foo']);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $otherUser = User::forceCreate([
@@ -57,8 +55,6 @@ public function test_user_cant_already_be_on_team()
 
         $this->expectException(ValidationException::class);
 
-        $this->migrate();
-
         $team = $this->createTeam();
 
         $otherUser = User::forceCreate([
@@ -86,9 +82,4 @@ protected function createTeam()
 
         return $action->create($user, ['name' => 'Test Team']);
     }
-
-    protected function migrate()
-    {
-        $this->artisan('migrate', ['--database' => 'testbench'])->run();
-    }
 }
diff --git a/tests/OrchestraTestCase.php b/tests/OrchestraTestCase.php
@@ -2,48 +2,21 @@
 
 namespace Laravel\Jetstream\Tests;
 
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Laravel\Fortify\FortifyServiceProvider;
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\JetstreamServiceProvider;
 use Livewire\LivewireServiceProvider;
+use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
 
 abstract class OrchestraTestCase extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-    }
-
-    protected function getPackageProviders($app)
-    {
-        return [
-            LivewireServiceProvider::class,
-            JetstreamServiceProvider::class,
-            FortifyServiceProvider::class,
-        ];
-    }
+    use LazilyRefreshDatabase, WithWorkbench;
 
     protected function defineEnvironment($app)
     {
-        $app['config']->set('database.default', 'testbench');
-
-        $app['config']->set('database.connections.testbench', [
-            'driver'   => 'sqlite',
-            'database' => ':memory:',
-            'prefix'   => '',
-        ]);
-    }
-
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
-        $this->loadMigrationsFrom(__DIR__.'/../vendor/laravel/fortify/database/migrations');
+        $app['config']->set('database.default', 'testing');
     }
 
     protected function defineHasTeamEnvironment($app)