From 063ea1892b3fecdd52ad8cd353c39038a8087de7 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 3 Oct 2024 15:02:03 -0700 Subject: [PATCH] Add trait to clean up files after test runs --- .../Importing/Api/ImportAccessoriesTest.php | 2 ++ .../Importing/Api/ImportAssetsTest.php | 2 ++ .../Importing/Api/ImportComponentsTest.php | 2 ++ .../Importing/Api/ImportConsumablesTest.php | 2 ++ .../Importing/Api/ImportLicenseTest.php | 2 ++ .../Feature/Importing/Api/ImportUsersTest.php | 3 +++ .../Support/Importing/CleansUpImportFiles.php | 20 +++++++++++++++++++ 7 files changed, 33 insertions(+) create mode 100644 tests/Support/Importing/CleansUpImportFiles.php diff --git a/tests/Feature/Importing/Api/ImportAccessoriesTest.php b/tests/Feature/Importing/Api/ImportAccessoriesTest.php index e4ad8b3bef..91f72fe747 100644 --- a/tests/Feature/Importing/Api/ImportAccessoriesTest.php +++ b/tests/Feature/Importing/Api/ImportAccessoriesTest.php @@ -19,9 +19,11 @@ use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; use Tests\Support\Importing\AccessoriesImportFileBuilder as ImportFileBuilder; +use Tests\Support\Importing\CleansUpImportFiles; class ImportAccessoriesTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Feature/Importing/Api/ImportAssetsTest.php b/tests/Feature/Importing/Api/ImportAssetsTest.php index 27fc723161..50c31d6d9f 100644 --- a/tests/Feature/Importing/Api/ImportAssetsTest.php +++ b/tests/Feature/Importing/Api/ImportAssetsTest.php @@ -22,9 +22,11 @@ use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; use Tests\Support\Importing\AssetsImportFileBuilder as ImportFileBuilder; +use Tests\Support\Importing\CleansUpImportFiles; class ImportAssetsTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Feature/Importing/Api/ImportComponentsTest.php b/tests/Feature/Importing/Api/ImportComponentsTest.php index 0eca70ae4c..20f0e803da 100644 --- a/tests/Feature/Importing/Api/ImportComponentsTest.php +++ b/tests/Feature/Importing/Api/ImportComponentsTest.php @@ -16,10 +16,12 @@ use Illuminate\Support\Facades\Notification; use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; +use Tests\Support\Importing\CleansUpImportFiles; use Tests\Support\Importing\ComponentsImportFileBuilder as ImportFileBuilder; class ImportComponentsTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Feature/Importing/Api/ImportConsumablesTest.php b/tests/Feature/Importing/Api/ImportConsumablesTest.php index 4b338629ac..d48486d19b 100644 --- a/tests/Feature/Importing/Api/ImportConsumablesTest.php +++ b/tests/Feature/Importing/Api/ImportConsumablesTest.php @@ -16,10 +16,12 @@ use Illuminate\Support\Facades\Notification; use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; +use Tests\Support\Importing\CleansUpImportFiles; use Tests\Support\Importing\ConsumablesImportFileBuilder as ImportFileBuilder; class ImportConsumablesTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Feature/Importing/Api/ImportLicenseTest.php b/tests/Feature/Importing/Api/ImportLicenseTest.php index 99f770c28e..fb4b9b932c 100644 --- a/tests/Feature/Importing/Api/ImportLicenseTest.php +++ b/tests/Feature/Importing/Api/ImportLicenseTest.php @@ -15,10 +15,12 @@ use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; +use Tests\Support\Importing\CleansUpImportFiles; use Tests\Support\Importing\LicensesImportFileBuilder as ImportFileBuilder; class ImportLicenseTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Feature/Importing/Api/ImportUsersTest.php b/tests/Feature/Importing/Api/ImportUsersTest.php index 6de7590902..eb624e5609 100644 --- a/tests/Feature/Importing/Api/ImportUsersTest.php +++ b/tests/Feature/Importing/Api/ImportUsersTest.php @@ -7,6 +7,7 @@ use App\Models\Import; use App\Models\Location; use App\Models\User; use Database\Factories\AssetFactory; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Database\Factories\UserFactory; use Database\Factories\ImportFactory; @@ -18,10 +19,12 @@ use Illuminate\Support\Facades\Notification; use Illuminate\Testing\TestResponse; use PHPUnit\Framework\Attributes\DataProvider; use Tests\Concerns\TestsPermissionsRequirement; +use Tests\Support\Importing\CleansUpImportFiles; use Tests\Support\Importing\UsersImportFileBuilder as ImportFileBuilder; class ImportUsersTest extends ImportDataTestCase implements TestsPermissionsRequirement { + use CleansUpImportFiles; use WithFaker; protected function importFileResponse(array $parameters = []): TestResponse diff --git a/tests/Support/Importing/CleansUpImportFiles.php b/tests/Support/Importing/CleansUpImportFiles.php new file mode 100644 index 0000000000..8e0cbc3108 --- /dev/null +++ b/tests/Support/Importing/CleansUpImportFiles.php @@ -0,0 +1,20 @@ +beforeApplicationDestroyed(function () use ($import) { + Storage::delete('private_uploads/imports/' . $import->file_path); + }); + }); + } +}