Skip to content

A free open source IT asset/license management system

Fixed tests

snipe13d5b724eee1
diff --git a/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php b/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
index 9ffad8c0ce..707f5468d4 100644
--- a/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
+++ b/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
@@ -57,13 +57,10 @@ class ExpiringAlertsNotificationTest extends TestCase
$this->artisan('snipeit:expiring-alerts')->assertExitCode(0);
- Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringWarrantyAsset) {
- return $mail->hasTo($alert_email) && $mail->assets->contains($expiringWarrantyAsset);
- });
-
- Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringEOLAsset) {
- return $mail->hasTo($alert_email) && $mail->assets->contains($expiringEOLAsset);
+ Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringWarrantyAsset, $expiringEOLAsset) {
+ return $mail->hasTo($alert_email) && ($mail->assets->contains($expiringEOLAsset) || $mail->assets->contains($expiringWarrantyAsset));
});
+
Mail::assertNotSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $notExpiringAsset, $alreadyExpiredAsset) {
return $mail->assets->contains($alert_email) || ($mail->assets->contains($alreadyExpiredAsset) && ($mail->assets->contains($notExpiringAsset)));