DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix moar tests

Browse source
This commit is contained in:
Godfrey M 2024-10-22 16:14:36 -07:00
parent ead27accac
commit 1e9922a0b0
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Listeners/CheckoutableListener.php
View file

@ -68,6 +68,7 @@ class CheckoutableListener
if ($notifiable instanceof User && $notifiable->email != '') { if ($notifiable instanceof User && $notifiable->email != '') {
if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() || if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
(method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) { (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
Mail::to($notifiable)->send($mailable); Mail::to($notifiable)->send($mailable);
Log::info('Sending email, Locale: ' . ($event->checkedOutTo->locale ?? 'default')); Log::info('Sending email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
} }

2
tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
View file

@ -159,7 +159,7 @@ class AccessoryCheckoutTest extends TestCase implements TestsPermissionsRequirem
'checkout_to_type' => 'user', 'checkout_to_type' => 'user',
]); ]);
Mail::assertNotSent(CheckoutAccessoryMail::class, function ($mail) use ($user) { Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($user) {
return $mail->hasTo($user->email); return $mail->hasTo($user->email);
}); });
} }

4
tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
View file

@ -64,7 +64,9 @@ class ConsumableCheckoutTest extends TestCase
'assigned_to' => $user->id, 'assigned_to' => $user->id,
]); ]);
Mail::assertSent($user, CheckoutConsumableMail::class); Mail::assertSent(CheckoutConsumableMail::class, function ($mail) use ($consumable, $user) {
return $mail->hasTo($user->email);
});
} }
public function testActionLogCreatedUponCheckout() public function testActionLogCreatedUponCheckout()

5
tests/Feature/Importing/Api/ImportAssetsTest.php
View file

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

1
tests/Support/AssertsAgainstSlackNotifications.php
View file

@ -14,7 +14,6 @@ trait AssertsAgainstSlackNotifications
new AnonymousNotifiable, new AnonymousNotifiable,
$notificationClass, $notificationClass,
function ($notification, $channels, $notifiable) { function ($notification, $channels, $notifiable) {
dd($notification);
return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint; return $notifiable->routes['slack'] === Setting::getSettings()->webhook_endpoint;
} }
); );

4
tests/Unit/NotificationTest.php
View file

@ -33,7 +33,9 @@ class NotificationTest extends TestCase
Mail::fake(); Mail::fake();
$asset->checkOut($user, $admin->id); $asset->checkOut($user, $admin->id);
Mail::assertSent($user, CheckoutAssetMail::class); Mail::assertSent(CheckoutAssetMail::class, function ($mail) use ($user) {
return $mail->hasTo($user->email);
});
} }
public function testDefaultEulaIsSentWhenSetInCategory() public function testDefaultEulaIsSentWhenSetInCategory()
{ {