Updated relation name for article images

spira · Aug 28, 2015 · 8048023 · 8048023
1 parent 65e1bb7
commit 8048023
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/api/app/Http/Controllers/ArticleImageController.php b/api/app/Http/Controllers/ArticleImageController.php
@@ -7,7 +7,7 @@
 
 class ArticleImageController extends ChildEntityController
 {
-    protected $relationName = 'imagesPivot';
+    protected $relationName = 'articleImages';
 
     public function __construct(Article $parentModel, EloquentModelTransformer $transformer)
     {

diff --git a/api/app/Models/Article.php b/api/app/Models/Article.php
@@ -185,7 +185,7 @@ public function images()
         return $this->belongsToMany(Image::class, 'image_article');
     }
 
-    public function imagesPivot()
+    public function articleImages()
     {
         return $this->hasMany(ArticleImage::class);
     }

diff --git a/api/tests/integration/ArticleImageTest.php b/api/tests/integration/ArticleImageTest.php
@@ -92,14 +92,14 @@ public function testPutManyNew()
             return $this->prepareEntity($entity);
         }, $articleImages);
 
-        $childCount = \App\Models\Article::find($article->article_id)->imagesPivot->count();
+        $childCount = \App\Models\Article::find($article->article_id)->articleImages->count();
 
         $this->putJson('/articles/'.$article->article_id.'/article-images', $images);
 
         $object = json_decode($this->response->getContent());
 
         $this->assertResponseStatus(201);
-        $this->assertEquals($childCount + 5, \App\Models\Article::find($article->article_id)->imagesPivot->count());
+        $this->assertEquals($childCount + 5, \App\Models\Article::find($article->article_id)->articleImages->count());
         $this->assertTrue(is_array($object));
         $this->assertCount(5, $object);
     }
@@ -126,15 +126,15 @@ public function testPutManyNewInvalid()
             unset($image['articleId']);
         }
 
-        $childCount = \App\Models\Article::find($article->article_id)->imagesPivot->count();
+        $childCount = \App\Models\Article::find($article->article_id)->articleImages->count();
 
         $this->putJson('/articles/'.$article->article_id.'/article-images', $images);
 
         $object = json_decode($this->response->getContent());
 
         $this->assertCount(5, $object->invalid);
         $this->assertObjectHasAttribute('articleId', $object->invalid[0]);
-        $this->assertEquals($childCount, \App\Models\Article::find($article->article_id)->imagesPivot->count());
+        $this->assertEquals($childCount, \App\Models\Article::find($article->article_id)->articleImages->count());
     }
 
 
@@ -145,16 +145,16 @@ public function testDeleteMany()
         $article = factory(App\Models\Article::class)->create();
         $this->addImagesToArticle($article);
 
-        $childCount = \App\Models\Article::find($article->article_id)->imagesPivot->count();
+        $childCount = \App\Models\Article::find($article->article_id)->articleImages->count();
 
         $images = array_map(function ($entity) {
             return $this->prepareEntity($entity);
-        }, $article->imagesPivot->all());
+        }, $article->articleImages->all());
 
         $this->deleteJson('/articles/'.$article->article_id.'/article-images', $images);
 
         $this->assertResponseStatus(204);
         $this->assertResponseHasNoContent();
-        $this->assertEquals($childCount - 5, \App\Models\Article::find($article->article_id)->imagesPivot->count());
+        $this->assertEquals($childCount - 5, \App\Models\Article::find($article->article_id)->articleImages->count());
     }
 }