attempt to fix tests p2

Author: Godmartinz

tests/Feature/Checkins/Ui/AccessoryCheckinTest.php

@@ -77,7 +77,7 @@ public function testEmailNotSentToUserIfSettingDisabled()
             '',
         ));
 
-        Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($accessory, $user) {
+        Mail::assertNotSent(CheckoutAccessoryMail::class, function ($mail) use ($accessory, $user) {
             return $mail->hasTo($user) && $mail->contains($accessory);
         });
     }

tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php

@@ -2,10 +2,12 @@
 
 namespace Tests\Feature\Checkouts\Api;
 
+use App\Mail\CheckoutAccessoryMail;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\User;
 use App\Notifications\CheckoutAccessoryNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\Concerns\TestsPermissionsRequirement;
 use Tests\TestCase;
@@ -146,7 +148,7 @@ public function testAccessoryCannotBeCheckedOutToInvalidUser()
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $accessory = Accessory::factory()->requiringAcceptance()->create();
         $user = User::factory()->create();
@@ -157,7 +159,9 @@ public function testUserSentNotificationUponCheckout()
                 'checkout_to_type' => 'user',
             ]);
 
-        Notification::assertSentTo($user, CheckoutAccessoryNotification::class);
+        Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($accessory, $user) {
+            return $mail->hasTo($user) && $mail->contains($accessory);
+        });
     }
 
     public function testActionLogCreatedUponCheckout()

tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php

@@ -2,10 +2,12 @@
 
 namespace Tests\Feature\Checkouts\Api;
 
+use App\Mail\CheckoutConsumableMail;
 use App\Models\Actionlog;
 use App\Models\Consumable;
 use App\Models\User;
 use App\Notifications\CheckoutConsumableNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -51,7 +53,7 @@ public function testConsumableCanBeCheckedOut()
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $consumable = Consumable::factory()->requiringAcceptance()->create();
 
@@ -62,7 +64,7 @@ public function testUserSentNotificationUponCheckout()
                 'assigned_to' => $user->id,
             ]);
 
-        Notification::assertSentTo($user, CheckoutConsumableNotification::class);
+        Mail::assertSentTo($user, CheckoutConsumableMail::class);
     }
 
     public function testActionLogCreatedUponCheckout()

tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php

@@ -171,7 +171,7 @@ public function testUserSentNotificationUponCheckout()
             ]);
 
         Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($accessory, $user) {
-            return $mail->hasTo($user) && $mail->contains($accessory);
+            return $mail->hasTo($user->email) && $mail->accessory->is($accessory);
         });
     }
 

tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php

@@ -66,7 +66,7 @@ public function testUserSentNotificationUponCheckout()
             ]);
 
         Mail::assertSent(CheckoutConsumableMail::class, function ($mail) use ($consumable, $user) {
-            return $mail->hasTo($user) && $mail->consumables->contains($consumable);
+            return $mail->hasTo($user->email) && $mail->consumable->is($consumable);
         });
     }
 

tests/Feature/Importing/Api/ImportAssetsTest.php

@@ -140,7 +140,9 @@ public function importAsset(): void
         //Notes is never read.
         // $this->assertEquals($row['notes'], $newAsset->notes);
 
-        Mail::assertSent($assignee, CheckoutAssetMail::class);
+        Mail::assertSent(CheckoutAssetMail::class, function ($mail) use ($assignee) {
+            return $mail->hasTo($assignee->email);
+        });
     }
 
     #[Test]

tests/Feature/Notifications/Email/EmailNotificationsUponCheckinTest.php

@@ -19,7 +19,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Notification::fake();
+        Mail::fake();
     }
 
     public function testCheckInEmailSentToUserIfSettingEnabled()

tests/Unit/NotificationTest.php

@@ -1,12 +1,14 @@
 <?php
 namespace Tests\Unit;
 
+use App\Mail\CheckoutAssetMail;
 use App\Models\User;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
 use Carbon\Carbon;
 use App\Notifications\CheckoutAssetNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -29,13 +31,13 @@ public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
                 'purchase_date' =>   Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0)->format('Y-m-d')
             ]);
 
-        Notification::fake();
+        Mail::fake();
         $asset->checkOut($user, $admin->id);
-        Notification::assertSentTo($user, CheckoutAssetNotification::class);
+        Mail::assertSent($user, CheckoutAssetMail::class);
     }
     public function testDefaultEulaIsSentWhenSetInCategory()
     {
-        Notification::fake();
+        Mail::fake();
 
         $this->settings->setEula('My Custom EULA Text');
 
@@ -51,10 +53,10 @@ public function testDefaultEulaIsSentWhenSetInCategory()
 
         $asset->checkOut($user, User::factory()->superuser()->create()->id);
 
-        Notification::assertSentTo($user, CheckoutAssetNotification::class, function ($notification) {
-            $content = $notification->toMail()->render();
-
-            return str_contains($content, 'My Custom EULA Text') && !str_contains($content, 'EULA Text that should not be used');
+        Mail::assertSent(CheckoutAssetMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email) &&
+                str_contains($mail->render(), 'My Custom EULA Text') &&
+                !str_contains($mail->render(), 'EULA Text that should not be used');
         });
     }
 }