From 0ce0cee81fc94c39f2d6cd299819089e75f08802 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 7 Aug 2025 16:53:18 +0100 Subject: [PATCH] Fixed tests Signed-off-by: snipe --- .../Api/EditAssetMaintenanceTest.php | 21 +++++--------- .../Feature/Settings/BrandingSettingsTest.php | 29 ++++++++----------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php b/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php index a6c1d25419..e6c84f3088 100644 --- a/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php +++ b/tests/Feature/AssetMaintenances/Api/EditAssetMaintenanceTest.php @@ -20,41 +20,36 @@ class EditAssetMaintenanceTest extends TestCase } - public function testCanCreateAssetMaintenance() + public function testCanEditAssetMaintenance() { Storage::fake('public'); $actor = User::factory()->superuser()->create(); - $asset = Asset::factory()->create(); $supplier = Supplier::factory()->create(); - $maintenance = AssetMaintenance::factory()->create(); - $this->actingAs($actor) + $response = $this->actingAs($actor) ->followingRedirects() - ->post(route('maintenances.update', $maintenance), [ + ->patch(route('maintenances.update', $maintenance), [ 'title' => 'Test Maintenance', - 'selected_assets' => [$asset->id], 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', 'start_date' => '2021-01-01', 'completion_date' => '2021-01-10', 'is_warranty' => '1', - 'cost' => '100.00', 'image' => UploadedFile::fake()->image('test_image.png'), 'notes' => 'A note', ]) ->assertOk(); - // Since we rename the file in the ImageUploadRequest, we have to fetch the record from the database - $assetMaintenance = AssetMaintenance::where('title', 'Test Maintenance')->first(); + $this->followRedirects($response)->assertSee('alert-success'); + $maintenance->refresh(); // Assert file was stored... - Storage::disk('public')->assertExists(app('asset_maintenances_path').$assetMaintenance->image); + Storage::disk('public')->assertExists(app('asset_maintenances_path').$maintenance->image); $this->assertDatabaseHas('asset_maintenances', [ - 'asset_id' => $asset->id, 'supplier_id' => $supplier->id, 'asset_maintenance_type' => 'Maintenance', 'title' => 'Test Maintenance', @@ -63,9 +58,7 @@ class EditAssetMaintenanceTest extends TestCase 'completion_date' => '2021-01-10', 'asset_maintenance_time' => '9', 'notes' => 'A note', - 'cost' => '100.00', - 'image' => $assetMaintenance->image, - 'created_by' => $actor->id, + 'image' => $maintenance->image, ]); } } diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php index 494c401d9e..d07b12c208 100644 --- a/tests/Feature/Settings/BrandingSettingsTest.php +++ b/tests/Feature/Settings/BrandingSettingsTest.php @@ -44,7 +44,7 @@ class BrandingSettingsTest extends TestCase $response = $this->actingAs(User::factory()->superuser()->create()) ->post(route('settings.branding.save', - ['logo' => UploadedFile::fake()->image('test_logo.png')->storeAs('', 'test_logo.png', 'public')] + ['logo' => UploadedFile::fake()->image('test_logo.png')] )) ->assertValid('logo') ->assertStatus(302) @@ -52,21 +52,21 @@ class BrandingSettingsTest extends TestCase ->assertSessionHasNoErrors(); // Assert files was stored... - Storage::disk('public')->assertExists('test_logo.jpg'); + Storage::disk('public')->assertExists( $setting->logo); $this->followRedirects($response)->assertSee('alert-success'); $setting->refresh(); - Storage::disk('public')->assertExists($setting->logo); } + public function testLogoCanBeDeleted() { Storage::fake('public'); + UploadedFile::fake()->image('new_test_logo.png')->storeAs('uploads', 'new_test_logo.png', 'public'); $setting = Setting::factory()->create(['logo' => 'new_test_logo.png']); - $original_file = UploadedFile::fake()->image('new_test_logo.png')->storeAs('uploads', 'new_test_logo.png', 'public'); - Storage::disk('public')->assertExists($original_file); + Storage::disk('public')->assertExists('uploads/'.$setting->logo); $this->assertNotNull($setting->logo); @@ -81,17 +81,13 @@ class BrandingSettingsTest extends TestCase $this->followRedirects($response)->assertSee(trans('alert-success')); $this->assertDatabaseHas('settings', ['logo' => null]); - //Storage::disk('public')->assertMissing($original_file); + Storage::disk('public')->assertMissing($setting->logo); } public function testEmailLogoCanBeUploaded() { Storage::fake('public'); - - $original_file = UploadedFile::fake()->image('before_test_email_logo.png')->storeAs('', 'before_test_email_logo.png', 'public'); - - Storage::disk('public')->assertExists($original_file); - Setting::factory()->create(['email_logo' => $original_file]); + Setting::factory()->create(['email_logo' => null]); $response = $this->actingAs(User::factory()->superuser()->create()) ->from(route('settings.branding.index')) @@ -107,16 +103,14 @@ class BrandingSettingsTest extends TestCase $this->followRedirects($response)->assertSee(trans('alert-success')); Storage::disk('public')->assertExists('new_test_email_logo.png'); - // Storage::disk('public')->assertMissing($original_file); } public function testEmailLogoCanBeDeleted() { Storage::fake('public'); - - $setting = Setting::factory()->create(['email_logo' => 'new_test_email_logo.png']); - $original_file = UploadedFile::fake()->image('new_test_email_logo.png')->storeAs('', 'new_test_email_logo.png', 'public'); - Storage::disk('public')->assertExists($original_file); + UploadedFile::fake()->image('new_test_logo.png')->storeAs('uploads', 'new_test_logo.png', 'public'); + $setting = Setting::factory()->create(['email_logo' => 'new_test_logo.png']); + Storage::disk('public')->assertExists('uploads/'.$setting->email_logo); $this->assertNotNull($setting->email_logo); @@ -128,11 +122,12 @@ class BrandingSettingsTest extends TestCase ->assertValid('email_logo') ->assertStatus(302) ->assertRedirect(route('settings.index')); + $setting->refresh(); $this->followRedirects($response)->assertSee(trans('alert-success')); $this->assertDatabaseHas('settings', ['email_logo' => null]); - //Storage::disk('public')->assertMissing('new_test_email_logo.png'); + Storage::disk('public')->assertMissing('new_test_email_logo.png'); }