Extract BaseFixture\Forum\Models.newThread()

pradoslaw · Jan 30, 2024 · 73cc5e2 · 73cc5e2
1 parent 6b87d6b
commit 73cc5e2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/tests/Unit/BaseFixture/Forum/Models.php b/tests/Unit/BaseFixture/Forum/Models.php
@@ -0,0 +1,17 @@
+<?php
+namespace Tests\Unit\BaseFixture\Forum;
+
+use Coyote\Forum;
+use Coyote\Topic;
+
+trait Models
+{
+    use Store;
+
+    function newThread(string $forumSlug, string $topicTitle): Topic
+    {
+        return $this->storeThread(
+            new Forum(['slug' => $forumSlug]),
+            new Topic(['title' => $topicTitle]));
+    }
+}
diff --git a/tests/Unit/Canonical/Topic/Fixture/Models.php b/tests/Unit/Canonical/Topic/Fixture/Models.php
@@ -8,6 +8,7 @@
 trait Models
 {
     use BaseFixture\Forum\Store;
+    use BaseFixture\Forum\Models;
 
     function newTopic(): string
     {
@@ -17,9 +18,7 @@ function newTopic(): string
 
     function newForumTopic(string $forumSlug, string $topicTitle): int
     {
-        $topic = $this->storeThread(
-            new Forum(['slug' => $forumSlug]),
-            new Topic(['title' => $topicTitle]));
+        $topic = $this->newThread($forumSlug, $topicTitle);
         return $topic->id;
     }
 

diff --git a/tests/Unit/Post/Fixture/Models.php b/tests/Unit/Post/Fixture/Models.php
@@ -8,13 +8,12 @@
 
 trait Models
 {
+    use BaseFixture\Forum\Models;
     use BaseFixture\Forum\Store;
 
     function newPostInCategoryTopic(string $forumSlug, string $topicTitle): array
     {
-        $origin = $this->storeThread(
-            new Forum(['slug' => $forumSlug]),
-            new Topic(['title' => $topicTitle]));
+        $origin = $this->newThread($forumSlug, $topicTitle);
         return [$origin->id, $origin->firstPost->id];
     }
 

diff --git a/tests/Unit/Seo/Schema/BreadcrumbList/Fixture/Models.php b/tests/Unit/Seo/Schema/BreadcrumbList/Fixture/Models.php
@@ -2,20 +2,12 @@
 namespace Tests\Unit\Seo\Schema\BreadcrumbList\Fixture;
 
 use Coyote\Forum;
-use Coyote\Topic;
 use Tests\Unit\BaseFixture;
 
 trait Models
 {
     use BaseFixture\Forum\Store;
 
-    function newThread(string $topicTitle, string $forumSlug): Topic
-    {
-        return $this->storeThread(
-            new Forum(['slug' => $forumSlug]),
-            new Topic(['title' => $topicTitle]));
-    }
-
     function newForum(string $name, string $slug): void
     {
         $forum = new Forum([

diff --git a/tests/Unit/Seo/Schema/BreadcrumbList/Fixture/Schema.php b/tests/Unit/Seo/Schema/BreadcrumbList/Fixture/Schema.php
@@ -1,11 +1,14 @@
 <?php
 namespace Tests\Unit\Seo\Schema\BreadcrumbList\Fixture;
 
+use Tests\Unit\BaseFixture;
 use Tests\Unit\Seo;
 
 trait Schema
 {
-    use Seo\Schema\Fixture\Schema, Seo\Schema\BreadcrumbList\Fixture\Models;
+    use BaseFixture\Forum\Models;
+    use Seo\Schema\Fixture\Schema;
+    use Seo\Schema\BreadcrumbList\Fixture\Models;
 
     function breadcrumbsSchema(): array
     {
@@ -26,7 +29,7 @@ function categoryWithParentSchema(string $parentName, string $parentSlug): array
 
     function topicSchema(string $topicTitle, string $forumSlug): array
     {
-        $topic = $this->newThread($topicTitle, $forumSlug);
+        $topic = $this->newThread($forumSlug, $topicTitle);
         return [
             $this->schema("/Forum/$forumSlug/{$topic->id}-{$topic->slug}", 'BreadcrumbList'),
             $topic->id,