merge both new assertions to assertRelated

Author: Gummibeer

README.md

@@ -136,7 +136,7 @@ This will prevent any method name conflicts with core, your custom or other trai
 \Astrotomic\PhpunitAssertions\Laravel\ModelAssertions::assertExists($model);
 \Astrotomic\PhpunitAssertions\Laravel\ModelAssertions::assertSame($model, \App\Models\User::first());
 \Astrotomic\PhpunitAssertions\Laravel\ModelAssertions::assertRelated($post, $comment, 'comments');
-\Astrotomic\PhpunitAssertions\Laravel\ModelAssertions::assertRelationship($post, \App\Models\Comment::class, 'comments', \Illuminate\Database\Eloquent\Relations\HasMany::class);
+\Astrotomic\PhpunitAssertions\Laravel\ModelAssertions::assertRelated($post, \App\Models\Comment::class, 'comments', \Illuminate\Database\Eloquent\Relations\HasMany::class);
 ```
 
 ### Blade

src/Laravel/ModelAssertions.php

@@ -44,28 +44,13 @@ public static function assertSame(Model $expected, $actual): void
         PHPUnit::assertTrue($expected->is($actual));
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string $relation
-     * @param \Illuminate\Database\Eloquent\Model|mixed $actual
-     */
-    public static function assertRelated(Model $model, string $relation, $actual)
-    {
-        PHPUnit::assertInstanceOf(Model::class, $actual);
-        PHPUnit::assertTrue(method_exists($model, $relation));
-        PHPUnit::assertInstanceOf(Relation::class, $model->$relation());
-
-        $related = $model->$relation()->whereKey($actual->getKey())->first();
-        self::assertSame($actual, $related);
-    }
-
     /**
      * @param \Illuminate\Database\Eloquent\Model $model
      * @param string $relation
      * @param string|\Illuminate\Database\Eloquent\Model|mixed $actual
      * @param string|null $type
      */
-    public static function assertRelationship(Model $model, string $relation, $actual, ?string $type = null)
+    public static function assertRelated(Model $model, string $relation, $actual, ?string $type = null)
     {
         PHPUnit::assertTrue(method_exists($model, $relation));
         PHPUnit::assertInstanceOf(Relation::class, $model->$relation());
@@ -81,7 +66,10 @@ public static function assertRelationship(Model $model, string $relation, $actua
             PHPUnit::assertInstanceOf($actual, $related);
         } else {
             PHPUnit::assertInstanceOf(get_class($actual), $related);
-            self::assertRelated($model, $relation, $actual);
+            self::assertSame(
+                $actual,
+                $model->$relation()->whereKey($actual->getKey())->first()
+            );
         }
     }
 }

tests/Laravel/ModelAssertionsTest.php

@@ -48,7 +48,7 @@ public function it_can_validate_same(): void
      * @test
      * @dataProvider hundredTimes
      */
-    public function it_can_validate_related(): void
+    public function it_can_validate_relationship(): void
     {
         $post = Post::create([
             'title' => self::randomString(),
@@ -59,31 +59,16 @@ public function it_can_validate_related(): void
             'post_id' => $post->getKey(),
         ]);
 
+        ModelAssertions::assertRelated($post, 'comments', Comment::class);
         ModelAssertions::assertRelated($post, 'comments', $comment);
-        ModelAssertions::assertRelated($comment, 'post', $post);
-    }
-
-    /**
-     * @test
-     * @dataProvider hundredTimes
-     */
-    public function it_can_validate_relationship(): void
-    {
-        $post = Post::create([
-            'title' => self::randomString(),
-        ]);
 
-        $comment = Comment::create([
-            'message' => self::randomString(),
-            'post_id' => $post->getKey(),
-        ]);
+        ModelAssertions::assertRelated($post, 'comments', Comment::class, HasMany::class);
+        ModelAssertions::assertRelated($post, 'comments', $comment, HasMany::class);
 
-        ModelAssertions::assertRelationship($post, 'comments', Comment::class);
-        ModelAssertions::assertRelationship($post, 'comments', Comment::class, HasMany::class);
-        ModelAssertions::assertRelationship($post, 'comments', $comment, HasMany::class);
+        ModelAssertions::assertRelated($comment, 'post', Post::class);
+        ModelAssertions::assertRelated($comment, 'post', $post);
 
-        ModelAssertions::assertRelationship($comment, 'post', Post::class);
-        ModelAssertions::assertRelationship($comment, 'post', Post::class, BelongsTo::class);
-        ModelAssertions::assertRelationship($comment, 'post', $post, BelongsTo::class);
+        ModelAssertions::assertRelated($comment, 'post', Post::class, BelongsTo::class);
+        ModelAssertions::assertRelated($comment, 'post', $post, BelongsTo::class);
     }
 }