Skip to content

A free open source IT asset/license management system

remove unnecessary changes

Godfrey M533d82d4d8f0
diff --git a/database/factories/CheckoutAcceptanceFactory.php b/database/factories/CheckoutAcceptanceFactory.php
index 5e0016763d..b53885807f 100644
--- a/database/factories/CheckoutAcceptanceFactory.php
+++ b/database/factories/CheckoutAcceptanceFactory.php
@@ -25,7 +25,7 @@ class CheckoutAcceptanceFactory extends Factory
}
protected static bool $skipAutoAssign = false;
- public function withoutAutoAssign(): static
+ public function withoutActionLog(): static
{
// turn off for this create() call
static::$skipAutoAssign = true;
diff --git a/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php b/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php
index 11afdaba4b..deb3e07d2c 100644
--- a/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php
+++ b/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php
@@ -86,38 +86,7 @@ class AssetAcceptanceReminderTest extends TestCase
public function testReminderIsSentToUser()
{
-<<<<<<< Updated upstream
$checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
-=======
- $checkedOutBy = User::factory()->canViewReports()->create();
-
- $checkoutTypes = [
- Asset::class => CheckoutAssetMail::class,
- Accessory::class => CheckoutAccessoryMail::class,
- LicenseSeat::class => CheckoutLicenseMail::class,
- Consumable::class => CheckoutConsumableMail::class,
- //for the future its setup for components, but we dont send reminders for components at the moment.
-// Component::class => CheckoutComponentMail::class,
- ];
-
- $assignee = User::factory()->create(['email' => '[email protected]']);
- foreach ($checkoutTypes as $modelClass => $mailable) {
-
- $item = $modelClass::factory()->create();
- $acceptance = CheckoutAcceptance::factory()->withoutAutoAssign()->pending()->create([
- 'checkoutable_id' => $item->id,
- 'checkoutable_type' => $modelClass,
- 'assigned_to_id' => $assignee->id,
- ]);
-
- if ($modelClass === LicenseSeat::class) {
- $logType = License::class;
- $logId = $item->license->id;
- } else {
- $logType = $modelClass;
- $logId = $item->id;
- }
->>>>>>> Stashed changes
$this->actingAs(User::factory()->canViewReports()->create())
->post($this->routeFor($checkoutAcceptance))