From 0eea8b54085b1867a11cdacb29ca71a0a49c018b Mon Sep 17 00:00:00 2001 From: Snider Date: Thu, 29 Jan 2026 22:33:41 +0000 Subject: [PATCH] fix: resolve CI test failures - Add activity log migration for tests - Fix migration path in ActivityLogServiceTest and LogsActivityTraitTest - Create tests/Unit directory with .gitkeep - Fix code style (line endings) via Laravel Pint Co-Authored-By: Claude Opus 4.5 --- ...01_01_000001_create_activity_log_table.php | 32 +++++++++++++++++++ .../Listeners/PlantTreeForAgentReferral.php | 2 +- .../Tests/Feature/DailyLimitAndBonusTest.php | 2 +- .../Tests/Feature/SignupReferralTest.php | 2 +- .../Feature/SubscriberMonthlyCommandTest.php | 4 +-- .../Trees/Tests/Feature/TreePlantingTest.php | 4 +-- tests/Feature/ActivityLogServiceTest.php | 2 +- tests/Feature/LogsActivityTraitTest.php | 2 +- tests/Unit/.gitkeep | 0 9 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 database/migrations/2024_01_01_000001_create_activity_log_table.php create mode 100644 tests/Unit/.gitkeep diff --git a/database/migrations/2024_01_01_000001_create_activity_log_table.php b/database/migrations/2024_01_01_000001_create_activity_log_table.php new file mode 100644 index 0000000..92c189b --- /dev/null +++ b/database/migrations/2024_01_01_000001_create_activity_log_table.php @@ -0,0 +1,32 @@ +bigIncrements('id'); + $table->string('log_name')->nullable(); + $table->text('description'); + $table->nullableMorphs('subject', 'subject'); + $table->nullableMorphs('causer', 'causer'); + $table->json('properties')->nullable(); + $table->uuid('batch_uuid')->nullable(); + $table->string('event')->nullable(); + $table->timestamps(); + + $table->index('log_name'); + }); + } + + public function down(): void + { + Schema::dropIfExists('activities'); + } +}; diff --git a/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php b/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php index 56a4998..91b16fa 100644 --- a/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php +++ b/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace Core\Mod\Trees\Listeners; use Core\Helpers\PrivacyHelper; +use Core\Mod\Trees\Models\TreePlanting; use Core\Tenant\Controllers\ReferralController; use Core\Tenant\Models\AgentReferralBonus; -use Core\Mod\Trees\Models\TreePlanting; use Illuminate\Auth\Events\Registered; use Illuminate\Support\Facades\Log; diff --git a/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php b/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php index 9e69871..7f58c1c 100644 --- a/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php +++ b/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Core\Tenant\Models\AgentReferralBonus; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreeReserve; +use Core\Tenant\Models\AgentReferralBonus; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/src/Mod/Trees/Tests/Feature/SignupReferralTest.php b/src/Mod/Trees/Tests/Feature/SignupReferralTest.php index f232f4a..f095781 100644 --- a/src/Mod/Trees/Tests/Feature/SignupReferralTest.php +++ b/src/Mod/Trees/Tests/Feature/SignupReferralTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -use Core\Tenant\Models\User; use Core\Mod\Trees\Listeners\PlantTreeForAgentReferral; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreeReserve; +use Core\Tenant\Models\User; use Illuminate\Auth\Events\Registered; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php b/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php index 9482a7a..bc3d729 100644 --- a/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php +++ b/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php @@ -3,12 +3,12 @@ declare(strict_types=1); use Core\Mod\Commerce\Models\Subscription; +use Core\Mod\Trees\Models\TreePlanting; +use Core\Mod\Trees\Models\TreeReserve; use Core\Tenant\Models\Package; use Core\Tenant\Models\User; use Core\Tenant\Models\Workspace; use Core\Tenant\Models\WorkspacePackage; -use Core\Mod\Trees\Models\TreePlanting; -use Core\Mod\Trees\Models\TreeReserve; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/src/Mod/Trees/Tests/Feature/TreePlantingTest.php b/src/Mod/Trees/Tests/Feature/TreePlantingTest.php index e05e61e..116ead9 100644 --- a/src/Mod/Trees/Tests/Feature/TreePlantingTest.php +++ b/src/Mod/Trees/Tests/Feature/TreePlantingTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -use Core\Tenant\Models\User; -use Core\Tenant\Models\Workspace; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreePlantingStats; use Core\Mod\Trees\Models\TreeReserve; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/tests/Feature/ActivityLogServiceTest.php b/tests/Feature/ActivityLogServiceTest.php index 343c8cc..be961a9 100644 --- a/tests/Feature/ActivityLogServiceTest.php +++ b/tests/Feature/ActivityLogServiceTest.php @@ -34,7 +34,7 @@ class ActivityLogServiceTest extends TestCase protected function defineDatabaseMigrations(): void { // Run the activity log migrations - $this->loadMigrationsFrom(__DIR__.'/../../vendor/spatie/laravel-activitylog/database/migrations'); + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); } public function test_fresh_returns_new_instance(): void diff --git a/tests/Feature/LogsActivityTraitTest.php b/tests/Feature/LogsActivityTraitTest.php index 63cb4b2..b4139de 100644 --- a/tests/Feature/LogsActivityTraitTest.php +++ b/tests/Feature/LogsActivityTraitTest.php @@ -85,7 +85,7 @@ class LogsActivityTraitTest extends TestCase protected function defineDatabaseMigrations(): void { - $this->loadMigrationsFrom(__DIR__.'/../../vendor/spatie/laravel-activitylog/database/migrations'); + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); } public function test_creates_activity_on_model_create(): void diff --git a/tests/Unit/.gitkeep b/tests/Unit/.gitkeep new file mode 100644 index 0000000..e69de29