Skip to content

A free open source IT asset/license management system

Organization

Marcus Moore3517e040c4a1
diff --git a/tests/Feature/Assets/Api/AuditAssetTest.php b/tests/Feature/Assets/Api/AuditAssetTest.php
index 02b305fa75..0ed9060087 100644
--- a/tests/Feature/Assets/Api/AuditAssetTest.php
+++ b/tests/Feature/Assets/Api/AuditAssetTest.php
@@ -59,29 +59,6 @@ class AuditAssetTest extends TestCase
$this->assertEquals($future, $asset->next_audit_date);
}
- /**
- * @link https://github.com/grokability/snipe-it/issues/18495
- */
- public function test_audit_does_not_set_next_audit_date_if_given_null()
- {
- $this->settings->setAuditInterval(null);
-
- $asset = Asset::factory()->create(['next_audit_date' => null]);
-
- $this->actingAsForApi(User::factory()->auditAssets()->create())
- ->postJson(route('api.asset.audit', $asset), [
- 'asset_tag' => $asset->asset_tag,
- // this is the important part
- 'next_audit_date' => null,
- 'note' => null,
- ])
- ->assertStatusMessageIs('success')
- ->assertStatus(200);
-
- $asset->refresh();
- $this->assertNull($asset->next_audit_date);
- }
-
public function test_asset_audit_is_saved()
{
$asset = Asset::factory()->create(['next_audit_date' => now()->subMonth()->toDateString()]);
@@ -111,4 +88,27 @@ class AuditAssetTest extends TestCase
$this->assertEquals($now, $asset->last_audit_date);
$this->assertEquals($future, $asset->next_audit_date);
}
+
+ /**
+ * @link https://github.com/grokability/snipe-it/issues/18495
+ */
+ public function test_audit_does_not_set_next_audit_date_if_given_null()
+ {
+ $this->settings->setAuditInterval(null);
+
+ $asset = Asset::factory()->create(['next_audit_date' => null]);
+
+ $this->actingAsForApi(User::factory()->auditAssets()->create())
+ ->postJson(route('api.asset.audit', $asset), [
+ 'asset_tag' => $asset->asset_tag,
+ // this is the important part
+ 'next_audit_date' => null,
+ 'note' => null,
+ ])
+ ->assertStatusMessageIs('success')
+ ->assertStatus(200);
+
+ $asset->refresh();
+ $this->assertNull($asset->next_audit_date);
+ }
}
diff --git a/tests/Feature/Assets/Ui/BulkAuditAssetsTest.php b/tests/Feature/Assets/Ui/BulkAuditAssetsTest.php
index 0bdd09b76a..9922abbb77 100644
--- a/tests/Feature/Assets/Ui/BulkAuditAssetsTest.php
+++ b/tests/Feature/Assets/Ui/BulkAuditAssetsTest.php
@@ -52,17 +52,4 @@ class BulkAuditAssetsTest extends TestCase
->assertViewIs('hardware.quickscan')
->assertViewHas('next_audit_date', Carbon::now()->addMonths(5)->toDateString());
}
-
- /**
- * @link https://github.com/grokability/snipe-it/issues/18495
- */
- public function test_audit_does_not_set_next_audit_date_if_given_null()
- {
- $this->markTestIncomplete();
- }
-
- public function test_can_audit_asset_from_bulk_audit_page()
- {
- $this->markTestIncomplete();
- }
}