From 43250ae88142d3168a009457c54d4eb01bbe261a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 11 Sep 2024 17:04:09 +0100 Subject: [PATCH] Updated tests Signed-off-by: snipe --- .../Controllers/Assets/AssetsController.php | 1 + tests/Feature/Assets/Ui/EditAssetTest.php | 22 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index d162b9a98..2bb248b99 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -343,6 +343,7 @@ class AssetsController extends Controller $originalValues = $asset->getRawOriginal(); $asset->assigned_to = null; $asset->assigned_type = null; + $asset->accepted = null; event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update', date('Y-m-d H:i:s'), $originalValues)); } diff --git a/tests/Feature/Assets/Ui/EditAssetTest.php b/tests/Feature/Assets/Ui/EditAssetTest.php index c17366bed..c7aa85478 100644 --- a/tests/Feature/Assets/Ui/EditAssetTest.php +++ b/tests/Feature/Assets/Ui/EditAssetTest.php @@ -73,34 +73,28 @@ class EditAssetTest extends TestCase Event::fake([CheckoutableCheckedIn::class]); $user = User::factory()->create(); - $location = Location::factory()->create(); $deployable_status = Statuslabel::factory()->rtd()->create(); $achived_status = Statuslabel::factory()->archived()->create(); - $asset = Asset::factory()->assignedToUser($user)->create(['status_id' => $deployable_status->id]); - $this->assertTrue($asset->assignedTo->is($user)); $currentTimestamp = now(); $this->actingAs(User::factory()->viewAssets()->editAssets()->create()) - ->post( - route('hardware.update', ['hardware' => $asset->id]), - [ + ->from(route('hardware.edit', $asset)) + ->patch(route('hardware.update', $asset), [ 'status_id' => $achived_status->id, + 'model_id' => $asset->model_id, + 'asset_tag' => $asset->asset_tag, ], - ); + ) + ->assertStatus(302); $asset->refresh(); - \Log::error('AssignedTo: '.$asset->refresh()->assignedTo); - \Log::error('Assigned_to: '.$asset->refresh()->assigned_to); - \Log::error('Assigned_type: '.$asset->refresh()->assigned_type); - $this->assertNull($asset->refresh()->assignedTo); - $this->assertNull($asset->refresh()->assigned_type); - $this->assertEquals($achived_status->id, $asset->refresh()->status_id); + $this->assertNull($asset->assigned_type); + $this->assertEquals($achived_status->id, $asset->status_id); Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) { - // this could be better mocked but is ok for now. return Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp) < 2; }, 1); }