Skip to content

A free open source IT asset/license management system

adds tests, webhook enable settings

Godfrey Me598ef6e054b
diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php
index a01aca7114..fecb66f350 100644
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -33,6 +33,10 @@ class AuditNotification extends Notification
//
$this->settings = Setting::getSettings();
$this->params = $params;
+ $item = $params['item'];
+ if (!$item || !is_object($item)) {
+ throw new \InvalidArgumentException('Notification requires a valid item.');
+ }
}
/**
@@ -93,12 +97,12 @@ class AuditNotification extends Notification
return MicrosoftTeamsMessage::create()
->to($setting->webhook_endpoint)
->type('success')
- ->title(class_basename(get_class($params['item'])) .' '.trans('general.audited'))
+ ->title(class_basename($item).' '.trans('general.audited'))
->addStartGroupToSection('activityText')
->fact(trans('mail.asset'), $item)
->fact(trans('general.administrator'), $admin_user->present()->viewUrl() . '|' . $admin_user->display_name);
}
- $message = class_basename(get_class($params['item'])) . ' Audited By '.$admin_user->display_name;
+ $message = class_basename(get_class($params['item'])) . trans('general.audited_by').' '.$admin_user->display_name;
$details = [
trans('mail.asset') => htmlspecialchars_decode($item->display_name),
trans('mail.notes') => $note ?: '',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 29be666fe7..87b8cc111e 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -39,6 +39,7 @@ return [
'accept_items' => 'Accept Items',
'audit' => 'Audit',
'audited' => 'Audited',
+ 'audited_by' => 'Audited By',
'audits' => 'Audits',
'audit_report' => 'Audit Log',
'assets' => 'Assets',
diff --git a/tests/Feature/Notifications/Webhooks/NotificationTests.php b/tests/Feature/Notifications/Webhooks/NotificationTests.php
new file mode 100644
index 0000000000..b7a23ab32f
--- /dev/null
+++ b/tests/Feature/Notifications/Webhooks/NotificationTests.php
@@ -0,0 +1,60 @@
+<?php
+namespace Tests\Feature\Notifications\Webhooks;
+
+use App\Models\Asset;
+use App\Models\User;
+use App\Notifications\AuditNotification;
+use Illuminate\Support\Facades\Notification;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+use Tests\Support\Settings;
+
+#[Group('notifications')]
+class NotificationTests extends TestCase
+{
+ protected function setUp(): void
+ {
+ parent::setUp();
+
+ Notification::fake();
+ }
+ public function testAuditNotificationThrowsWhenItemIsNull()
+ {
+ try {
+ new AuditNotification([
+ 'item' => null,
+ ]);
+ $this->fail('Expected Error was not thrown');
+ } catch (\Throwable $e) {
+ $this->assertInstanceOf(\InvalidArgumentException::class, $e);
+ $this->assertSame('Notification requires a valid item.', $e->getMessage());
+ }
+ }
+
+ public function testAuditNotificationFires()
+ {
+ $webhook_options = [
+ 'enableSlackWebhook',
+ 'enableMicrosoftTeamsWebhook',
+ ];
+
+ Notification::fake();
+
+ foreach($webhook_options as $option) {
+
+ $this->settings->{$option}();
+
+ $user = User::factory()->create();
+ $item = Asset::factory()->create();
+
+ try {
+ $user->notify(new \App\Notifications\AuditNotification([
+ 'item' => $item,
+ ]));
+ } catch (\InvalidArgumentException $e) {
+ $this->fail("AuditNotification threw for [{$option}]: {$e->getMessage()}");
+ }
+ }
+ Notification::assertSentTimes(AuditNotification::class, count($webhook_options));
+ }
+}
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index 8ff8ba6945..bb255bc67c 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -93,6 +93,13 @@ class Settings
'webhook_channel' => '#it',
]);
}
+ public function enableMicrosoftTeamsWebhook(): Settings
+ {
+ return $this->update([
+ 'webhook_selected' => 'microsoft',
+ 'webhook_endpoint' => 'https://defaultd07ceb04416641fca1b9d3e0ac7600.84.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/1babbc7a3cdd4cf99c0fbed4367cf147/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=sVXmAYF5luz3oOEjvN-G7mJqEEvFjBSETuAG8c3Qmkg',
+ ]);
+ }
public function disableSlackWebhook(): Settings
{