Skip to content

A free open source IT asset/license management system

Updated test

snipe5517bbeb51c9
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index e0a6827251..2c7b8dd955 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -156,6 +156,7 @@ class AssetModelsTransformer
: (int) ($assetmodel->assets_count - (int) $assetmodel->assets_assigned_count) - (int) $assetmodel->assets_archived_count,
'assigned_to_self' => $userHasOpenRequest,
'available_actions' => [
+ 'view' => Gate::allows('view', $assetmodel),
'request' => ! $userHasOpenRequest,
'cancel' => $userHasOpenRequest,
],
diff --git a/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php b/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php
index 0e34d45a43..767aa5d7f0 100644
--- a/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php
+++ b/tests/Feature/AssetModels/Api/RequestableAssetModelsApiTest.php
@@ -26,7 +26,7 @@ class RequestableAssetModelsApiTest extends TestCase
$requestable = AssetModel::factory()->create(['requestable' => 1]);
$notRequestable = AssetModel::factory()->create(['requestable' => 0]);
- $rows = $this->actingAsForApi(User::factory()->create())
+ $rows = $this->actingAsForApi(User::factory()->viewRequestableAssets()->create())
->getJson(route('api.assetmodels.requestable'))
->assertOk()
->json('rows');
@@ -38,7 +38,7 @@ class RequestableAssetModelsApiTest extends TestCase
public function test_row_carries_assigned_to_self_true_when_user_has_open_request(): void
{
- $user = User::factory()->create();
+ $user = User::factory()->viewRequestableAssets()->create();
$model = AssetModel::factory()->create(['requestable' => 1]);
CheckoutRequest::factory()->create([
'user_id' => $user->id,
@@ -60,7 +60,7 @@ class RequestableAssetModelsApiTest extends TestCase
public function test_row_carries_assigned_to_self_false_for_other_users_requests(): void
{
- $me = User::factory()->create();
+ $me = User::factory()->viewRequestableAssets()->create();
$someoneElse = User::factory()->create();
$model = AssetModel::factory()->create(['requestable' => 1]);
// Not my request.
@@ -84,7 +84,7 @@ class RequestableAssetModelsApiTest extends TestCase
{
// Cancel semantics: a canceled row shouldn't leave the user
// stuck seeing a cancel button they can't act on.
- $user = User::factory()->create();
+ $user = User::factory()->viewRequestableAssets()->create();
$model = AssetModel::factory()->create(['requestable' => 1]);
CheckoutRequest::factory()->create([
'user_id' => $user->id,
@@ -111,7 +111,7 @@ class RequestableAssetModelsApiTest extends TestCase
// eager-loaded requests collection is already scoped to this
// model - but codify the isolation with a test so a future
// refactor doesn't regress it.
- $user = User::factory()->create();
+ $user = User::factory()->viewRequestableAssets()->create();
AssetModel::factory()->create(['requestable' => 1]);
$accessory = Accessory::factory()->create();
CheckoutRequest::factory()->create([
@@ -136,8 +136,8 @@ class RequestableAssetModelsApiTest extends TestCase
// a user without it gets view=false.
AssetModel::factory()->create(['requestable' => 1]);
- $withView = User::factory()->viewAssetModels()->create();
- $withoutView = User::factory()->create();
+ $withView = User::factory()->viewRequestableAssets()->viewAssetModels()->create();
+ $withoutView = User::factory()->viewRequestableAssets()->create();
$rowWith = $this->actingAsForApi($withView)
->getJson(route('api.assetmodels.requestable'))
@@ -149,7 +149,7 @@ class RequestableAssetModelsApiTest extends TestCase
$this->assertTrue($rowWith['available_actions']['view']);
$this->assertFalse($rowWithout['available_actions']['view']);
}
-
+
public function test_remaining_reflects_deployable_asset_count(): void
{
$model = AssetModel::factory()->create(['requestable' => 1]);
@@ -169,7 +169,7 @@ class RequestableAssetModelsApiTest extends TestCase
'assigned_type' => User::class,
]);
- $row = $this->actingAsForApi(User::factory()->create())
+ $row = $this->actingAsForApi(User::factory()->viewRequestableAssets()->create())
->getJson(route('api.assetmodels.requestable'))
->assertOk()
->json('rows.0');