Add some more tests for scheduling

Author: oddvalue

database/factories/PostFactory.php

@@ -11,31 +11,27 @@ class PostFactory extends \Illuminate\Database\Eloquent\Factories\Factory
     /**
      * @inheritDoc
      */
-    public function definition()
+    public function definition(): array
     {
         return [
             'title' => $this->faker->sentence,
             'is_current' => true,
         ];
     }
 
-    public function draft()
+    public function draft(): PostFactory
     {
-        return $this->state(function () {
-            return [
-                'published_at' => null,
-                'is_published' => false,
-            ];
-        });
+        return $this->state(fn (): array => [
+            'published_at' => null,
+            'is_published' => false,
+        ]);
     }
 
-    public function published()
+    public function published(): PostFactory
     {
-        return $this->state(function () {
-            return [
-                'published_at' => now()->toDateTimeString(),
-                'is_published' => true,
-            ];
-        });
+        return $this->state(fn (): array => [
+            'published_at' => now()->toDateTimeString(),
+            'is_published' => true,
+        ]);
     }
 }

src/Commands/PublishScheduledDrafts.php

@@ -17,8 +17,8 @@ public function handle(): int
     {
         $class = $this->argument('model');
 
-        if (! class_exists($class) || ! in_array(HasDrafts::class, class_uses_recursive($class), strict: true)) {
-            throw new InvalidArgumentException("The model `{$class}` either doesn't exist or doesn't use the `HasDrafts` trait.");
+        if (! class_exists($class) || ! in_array(Draftable::class, class_implements($class), strict: true)) {
+            throw new InvalidArgumentException("The model `{$class}` either doesn't exist or doesn't implement `Draftable`.");
         }
 
         $model = new $class();

tests/ConfigTest.php

@@ -25,6 +25,7 @@
 it('can override columns via class constants', function () {
     $post = new class () extends Post {
         public const PUBLISHED_AT = 'published_at_override';
+        public const WILL_PUBLISH_AT = 'will_publish_at_overridee';
         public const IS_PUBLISHED = 'is_published_override';
         public const IS_CURRENT = 'is_current_override';
         public const UUID = 'uuid_override';
@@ -34,6 +35,7 @@
 
     expect($post->getPublishedAtColumn())->toBe($post::PUBLISHED_AT)
         ->and($post->getQualifiedPublishedAtColumn())->toBe($post->qualifyColumn($post::PUBLISHED_AT))
+        ->and($post->getWillPublishAtColumn())->toBe($post::WILL_PUBLISH_AT)
         ->and($post->getIsPublishedColumn())->toBe($post::IS_PUBLISHED)
         ->and($post->getIsCurrentColumn())->toBe($post::IS_CURRENT)
         ->and($post->getUuidColumn())->toBe($post::UUID)

tests/SchedulingTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Artisan;
+use Oddvalue\LaravelDrafts\Tests\Post;
 use Oddvalue\LaravelDrafts\Tests\SchedulingPost;
 
 use function Spatie\PestPluginTestTime\testTime;
@@ -24,11 +26,40 @@
 
     testTime()->addMonth()->freeze();
 
-    \Illuminate\Support\Facades\Artisan::call('drafts:publish', ['model' => SchedulingPost::class]);
+    Artisan::call('drafts:publish', ['model' => SchedulingPost::class]);
 
     $this->assertDatabaseHas('posts', [
         'title' => 'Hello World',
         'published_at' => now()->toDateTimeString(),
         'will_publish_at' => null,
     ]);
 });
+
+it('fails when the model doesnt implement the contract', function (): void {
+    expect(static fn() => Artisan::call('drafts:publish', ['model' => Post::class]))
+        ->toThrow(InvalidArgumentException::class);
+});
+
+it('can clear the schedule date on a revision', function (): void {
+    $willPublishAt = now()->addWeek();
+    $post = SchedulingPost::factory()
+        ->published()
+        ->has(
+            SchedulingPost::factory(),
+            'revisions'
+        )
+        ->create();
+    $draft = $post->createDraft(['title' => 'Hello World']);
+    $draft->schedulePublishing($willPublishAt);
+    $draft->clearScheduledPublishing()->save();
+
+    testTime()->addMonth()->freeze();
+
+    Artisan::call('drafts:publish', ['model' => SchedulingPost::class]);
+
+    $this->assertDatabaseHas('posts', [
+        'title' => 'Hello World',
+        'published_at' => null,
+        'will_publish_at' => null,
+    ]);
+});