remove MocksApplicationServices trait

qirolab · Feb 14, 2023 · b4ba8fa · b4ba8fa
1 parent d57d1e8
commit b4ba8fa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/tests/Unit/ModelBannedEventTest.php b/tests/Unit/ModelBannedEventTest.php
@@ -2,32 +2,37 @@
 
 namespace Qirolab\Tests\Laravel\Bannable\Unit;
 
-use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
+use Illuminate\Support\Facades\Event;
 use Qirolab\Laravel\Bannable\Events\ModelWasBanned;
 use Qirolab\Tests\Laravel\Bannable\Stubs\Models\User;
 use Qirolab\Tests\Laravel\Bannable\TestCase;
 
 class ModelBannedEventTest extends TestCase
 {
-    use MocksApplicationServices;
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Event::fake([ModelWasBanned::class]);
+    }
 
     /** @test */
     public function it_can_fire_event_on_helper_call()
     {
-        $this->expectsEvents(ModelWasBanned::class);
-
         $entity = $this->createUser(User::class);
 
         $entity->ban();
+
+        Event::assertDispatched(ModelWasBanned::class);
     }
 
     /** @test */
     public function it_can_fire_event_on_relation_create()
     {
-        $this->expectsEvents(ModelWasBanned::class);
-
         $entity = $this->createUser(User::class);
 
         $entity->bans()->create();
+
+        Event::assertDispatched(ModelWasBanned::class);
     }
 }
diff --git a/tests/Unit/ModelUnbannedEventTest.php b/tests/Unit/ModelUnbannedEventTest.php
@@ -2,31 +2,36 @@
 
 namespace Qirolab\Tests\Laravel\Bannable\Unit;
 
-use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
+use Illuminate\Support\Facades\Event;
 use Qirolab\Laravel\Bannable\Events\ModelWasUnbanned;
 use Qirolab\Tests\Laravel\Bannable\TestCase;
 
 class ModelUnbannedEventTest extends TestCase
 {
-    use MocksApplicationServices;
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Event::fake([ModelWasUnbanned::class]);
+    }
 
     /** @test */
     public function it_can_fire_event_on_helper_call()
     {
-        $this->expectsEvents(ModelWasUnbanned::class);
-
         $ban = $this->createBan();
 
         $ban->bannable->unban();
+
+        Event::assertDispatched(ModelWasUnbanned::class);
     }
 
     /** @test */
     public function it_can_fire_event_on_relation_delete()
     {
-        $this->expectsEvents(ModelWasUnbanned::class);
-
         $ban = $this->createBan();
 
         $ban->delete();
+
+        Event::assertDispatched(ModelWasUnbanned::class);
     }
 }