DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-23 19:59:18 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Improve event assertions

Browse source
This commit is contained in:
Marcus Moore 2024-05-22 15:38:23 -07:00
parent 1fe22e4b7b
commit f16c79bb9a
No known key found for this signature in database
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/AssetsController.php
View file

@ -852,12 +852,9 @@ class AssetsController extends Controller
} }
$checkout_at = request('checkout_at', date('Y-m-d H:i:s')); $checkout_at = request('checkout_at', date('Y-m-d H:i:s'));
// @todo: test this
$expected_checkin = request('expected_checkin', null); $expected_checkin = request('expected_checkin', null);
// @todo: test this
$note = request('note', null); $note = request('note', null);
// Using `->has` preserves the asset name if the name parameter was not included in request. // Using `->has` preserves the asset name if the name parameter was not included in request.
// @todo: test this
$asset_name = request()->has('name') ? request('name') : $asset->name; $asset_name = request()->has('name') ? request('name') : $asset->name;
// Set the location ID to the RTD location id if there is one // Set the location ID to the RTD location id if there is one

17
tests/Feature/Api/Assets/AssetCheckoutTest.php
View file

@ -160,20 +160,21 @@ class AssetCheckoutTest extends TestCase
$this->actingAsForApi($admin) $this->actingAsForApi($admin)
->postJson(route('api.asset.checkout', $asset), [ ->postJson(route('api.asset.checkout', $asset), [
'checkout_to_type' => $type, 'checkout_to_type' => $type,
'assigned_' . $type => $target->id, 'assigned_'.$type => $target->id,
'status_id' => $newStatus->id, 'status_id' => $newStatus->id,
'checkout_at' => '2024-04-01', 'checkout_at' => '2024-04-01',
'expected_checkin' => '2024-04-08', 'expected_checkin' => '2024-04-08',
'name' => 'Changed Name', 'name' => 'Changed Name',
'note' => 'Here is a cool note!', 'note' => 'Here is a cool note!',
]); ])
->assertOk();
$asset->refresh(); $asset->refresh();
$this->assertTrue($asset->assignedTo()->is($target)); $this->assertTrue($asset->assignedTo()->is($target));
$this->assertEquals('Changed Name', $asset->name); $this->assertEquals('Changed Name', $asset->name);
$this->assertTrue($asset->assetstatus->is($newStatus)); $this->assertTrue($asset->assetstatus->is($newStatus));
$this->assertEquals('2024-04-01 00:00:00', $asset->last_checkout); $this->assertEquals('2024-04-01 00:00:00', $asset->last_checkout);
$this->assertEquals('2024-04-08 00:00:00', (string)$asset->expected_checkin); $this->assertEquals('2024-04-08 00:00:00', (string) $asset->expected_checkin);
$expectedLocation $expectedLocation
? $this->assertTrue($asset->location->is($expectedLocation)) ? $this->assertTrue($asset->location->is($expectedLocation))
@ -181,10 +182,12 @@ class AssetCheckoutTest extends TestCase
Event::assertDispatched(CheckoutableCheckedOut::class, 1); Event::assertDispatched(CheckoutableCheckedOut::class, 1);
Event::assertDispatched(function (CheckoutableCheckedOut $event) use ($admin, $asset, $target) { Event::assertDispatched(function (CheckoutableCheckedOut $event) use ($admin, $asset, $target) {
return $event->checkoutable->is($asset) $this->assertTrue($event->checkoutable->is($asset));
&& $event->checkedOutTo->is($target) $this->assertTrue($event->checkedOutTo->is($target));
&& $event->checkedOutBy->is($admin) $this->assertTrue($event->checkedOutBy->is($admin));
&& $event->note === 'Here is a cool note!'; $this->assertEquals('Here is a cool note!', $event->note);
return true;
}); });
} }