Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	tests/src/TestCase.php

Author: cklei-carly

tests/src/Feature/Commands/ExecuteImportJobTest.php

@@ -19,16 +19,16 @@
             ->expectsOutput('No pending jobs found.')
             ->assertExitCode(Command::SUCCESS);
     });
-    
+
     it('handles job execution failure', function () {
         $job = createImportJobWithFakeFile('test.csv');
-    
+
         $this->artisan($this->command)
             ->expectsOutput("Executing job {$job->getKey()} ...")
             ->assertExitCode(Command::SUCCESS);
-    
+
         $job->refresh();
-    
+
         expect($job->failed_at)->not->toBeNull();
     });
 

tests/src/Feature/Commands/PruneModelTest.php

@@ -24,11 +24,11 @@
         $jobs = Import::factory()->count(5)->isCompleted()->create([
             'created_at' => now()->subDays(ImportDataHelper::retrieveClearanceDaysInterval() + 1),
         ]);
-    
+
         $this->assertDatabaseCount(app(Import::class), count($jobs));
-    
+
         $this->artisan($this->command)->assertExitCode(Command::SUCCESS);
-    
+
         // Assert that the jobs were deleted
         $this->assertDatabaseCount(app(Import::class), 0);
     });
@@ -39,86 +39,85 @@
 
     it('has no versions to cleanup', function () {
         $model = ContentVersion::factory()->avoidToClean(false)->create();
-    
+
         // Run the command
         $this->artisan($this->command)->assertExitCode(Command::SUCCESS);
     });
 
     it('cleans up versions', function () {
         // Create some versions to cleanup
         $modelClass = ContentVersion::class;
-    
+
         $model = new $modelClass;
-    
+
         $this->travel(-31)->days();
         $oldVersion = $modelClass::factory()->avoidToClean(false)->create();
         $this->travelBack();
-    
+
         $this->travel(-29)->days();
         $newVersion = $modelClass::factory()->avoidToClean(false)->create();
         $this->travelBack();
-    
+
         // Run the command
         $this->artisan($this->command)->assertExitCode(Command::SUCCESS);
-    
+
         // Assert the old version is deleted and the new one is not
         $this->assertDatabaseMissing($model, ['id' => $oldVersion->id]);
         $this->assertDatabaseHas($model, ['id' => $newVersion->id]);
     });
-    
+
     it('cleans up versions with avoid to clean', function () {
         // Create some versions to cleanup
         $modelClass = ContentVersion::class;
-    
+
         $model = new $modelClass;
-    
+
         $this->travel(-31)->days();
         $oldVersion = $modelClass::factory()->avoidToClean(true)->create();
         $this->travelBack();
-    
+
         $this->travel(-29)->days();
         $newVersion = $modelClass::factory()->avoidToClean(false)->create();
         $this->travelBack();
-    
+
         // Run the command
         $this->artisan($this->command)->assertExitCode(Command::SUCCESS);
-    
+
         // Assert the old version is deleted and the new one is not
         $this->assertDatabaseHas($model, ['id' => $oldVersion->id]);
         $this->assertDatabaseHas($model, ['id' => $newVersion->id]);
     });
-    
+
     it('cleans up versions with publish log', function () {
         // Create some versions to cleanup
         $modelClass = ContentVersion::class;
         $publishVerionModelClass = ContentPublishVersion::class;
-    
+
         $model = new $modelClass;
         $publishVersionModel = new $publishVerionModelClass;
-    
+
         $this->travel(-31)->days();
         $oldVersion = $modelClass::factory()->avoidToClean(false)->withPublishLog()->create();
         $oldVersionId = $oldVersion->id;
         $this->travelBack();
-    
+
         $this->travel(-29)->days();
         $newVersion = $modelClass::factory()->avoidToClean(false)->withPublishLog()->create();
         $newVersionId = $newVersion->id;
         $this->travelBack();
-    
+
         // Run the command
         $this->artisan($this->command)->assertExitCode(Command::SUCCESS);
-    
+
         // Assert the old version is deleted and the new one is not
         $this->assertDatabaseMissing($model, ['id' => $oldVersionId]);
         $this->assertDatabaseHas($model, ['id' => $newVersionId]);
-    
+
         $oldVersionExists = $publishVersionModel::withoutGlobalScopes([])->where('version_id', $oldVersionId)->exists();
         $newVersionExists = $publishVersionModel::withoutGlobalScopes([])->where('version_id', $newVersionId)->exists();
-    
+
         expect($oldVersionExists)->toBeFalse();
         expect($newVersionExists)->toBeTrue();
     });
 
-    
-})->group('feature', 'command', 'content-version');
+})->group('feature', 'command', 'content-version');

tests/src/TestCase.php

@@ -153,8 +153,7 @@ protected function loadMigrationsFrom($paths): void
                 $migration = include $path;
                 $migration->up();
             }
-        }
-        else {
+        } else {
             parent::loadMigrationsFrom($paths);
         }
     }

tests/src/Unit/Models/ContentTest.php

@@ -20,14 +20,14 @@
             'slug' => 'test-content',
         ]);
         $content->refresh();
-    
+
         $contentKey = $content->getKey();
-    
+
         // Assert
         $this->assertDatabaseHas('content', ['id' => $contentKey]);
         $this->assertDatabaseHas('content_versions', ['content_id' => $contentKey]);
         $this->assertDatabaseHas('nestable_trees', ['nestable_id' => $contentKey, 'nestable_type' => $content->getMorphClass()]);
-    
+
         // Create publish version
         $status = ContentStatusManifest::getOption('publish');
         $content->status = $status->getValue();
@@ -38,14 +38,13 @@
         ]);
         $content->setPublishableState($status->getName());
         $content->save();
-    
+
         $content->refresh();
-    
+
         $this->assertDatabaseHas('content_publish_version', ['content_id' => $contentKey]);
     });
-    
+
     it('create or delete related routes and paths', function () {
-        
 
         $webTypeDocumentType = DocumentType::factory()->create()->refresh();
         $content = Content::factory()->create([
@@ -59,7 +58,7 @@
         $this->assertDatabaseHas('content', ['id' => $contentId]);
         $this->assertDatabaseHas('content_paths', ['key' => $contentId]);
         $this->assertDatabaseHas('content_routes', ['content_id' => $contentId]);
-    
+
         // Act 1: soft delete
         $content->delete();
 
@@ -76,7 +75,7 @@
         $this->assertDatabaseMissing('content_paths', ['key' => $contentId]);
         $this->assertDatabaseMissing('content_routes', ['content_id' => $contentId]);
     });
-    
+
     it('deletes children if parent is deleted', function () {
         // Arrange
         $parent = Content::factory()->create([
@@ -88,34 +87,33 @@
             'parent_id' => $parent->id,
         ]);
         $child->refresh();
-    
+
         // Act
         $parent->delete();
-    
+
         // Assert
         $this->assertSoftDeleted('content', ['id' => $child->id]);
     });
-    
+
     it('deletes content versions and nestable tree if content is deleted', function () {
         // Arrange
         $content = Content::factory()->havePropertyData([
             'test' => 'test',
         ])->create(['slug' => 'test-force-delete']);
         $content->refresh();
-    
+
         // Assert 1
         $this->assertDatabaseHas('content', ['id' => $content->id]);
         $this->assertDatabaseHas('content_versions', ['content_id' => $content->id]);
         $this->assertDatabaseHas('nestable_trees', ['nestable_id' => $content->id, 'nestable_type' => $content->getMorphClass()]);
-    
+
         // Act
         $content->forceDelete();
-    
+
         // Assert 2
         $this->assertDatabaseMissing('content', ['id' => $content->id]);
         $this->assertDatabaseMissing('content_versions', ['content_id' => $content->id]);
         $this->assertDatabaseMissing('nestable_trees', ['content_id' => $content->id]);
     });
 
-    
-})->group('unit', 'model');
+})->group('unit', 'model');

tests/src/Unit/Models/DocumentTypeTest.php

@@ -7,15 +7,14 @@
 
 uses(TestCase::class);
 
-
 describe('document type model', function () {
 
     it('throws an exception when deleting a document type with content', function () {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Cannot delete this document type because it has content.');
-    
+
         $documentType = DocumentType::factory(['category' => 'web'])->create();
-    
+
         $content = Content::factory([
             'title' => ['en' => 1],
             'slug' => '1',
@@ -25,17 +24,16 @@
         ])->create();
         $content->preloadContentVersionData();
         $content->save();
-    
+
         $documentType->delete();
     });
-    
+
     it('does not throw an exception when deleting a document type without content', function () {
         $documentType = DocumentType::factory(['category' => 'web'])->create();
-    
+
         $documentType->delete();
-    
+
         expect(true)->toBeTrue(); // If no exception is thrown, the test passes
     });
 
-    
-})->group('unit', 'model');
+})->group('unit', 'model');

tests/src/Unit/Models/LanguageTest.php

@@ -20,18 +20,18 @@
         expect($newDefaultLanguage->fresh()->is_default)->toBeTrue();
 
     });
-    
+
     it('can delete related content routes', function () {
         $en = Language::factory()->create(['code' => 'en', 'is_default' => true]);
         $fr = Language::factory()->create(['code' => 'fr', 'is_default' => false]);
 
         $content = Content::factory()
             ->has(ContentRoute::factory()->state([
-                'language_id' => $fr->getKey(), 
+                'language_id' => $fr->getKey(),
                 'uri' => 'abc',
             ]), 'routes')
             ->create();
-            
+
         expect($content->routes->count())->toBe(1);
 
         $fr->delete();
@@ -40,13 +40,13 @@
 
         expect($content->routes->count())->toBe(0);
     });
-    
+
     it('throws exception for default language when deleting', function () {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Cannot delete default language');
-    
+
         $language = Language::factory()->create(['is_default' => true]);
         $language->delete();
     });
-    
-})->group('unit', 'model');
+
+})->group('unit', 'model');