BlogHelper_getCategoryByName

plugins/bc-blog/src/Model/Table/BlogCategoriesTable.php

@@ -355,21 +355,15 @@ public function hasChild($id)
      * @param int $blogContentId
      * @param string $name
      * @param array $options
-     * @return array|null
+     * @return EntityInterface
      */
     public function getByName($blogContentId, $name, $options = [])
     {
-        $options = array_merge([
-            'conditions' => [
-                'BlogCategory.blog_content_id' => $blogContentId,
-                'BlogCategory.name' => urlencode($name),
-            ],
-            'recursive' => -1
-        ], $options);
-        $this->unbindModel(['hasMany' => ['BlogPost']]);
-        return $this->find('first', $options);
+        return $this->find()->where([
+            'BlogCategories.blog_content_id' => $blogContentId,
+            'BlogCategories.name' => urlencode($name),
+        ])->first();
     }
-
     /**
      * コピーする
      *

plugins/bc-blog/src/View/Helper/BlogHelper.php

@@ -2022,15 +2022,17 @@ public function isSameSiteBlogContent($blogContentId)
      * @param int $blogContentId
      * @param string $categoryName
      * @param array $options
-     * @return array
+     * @return EntityInterface
+     * @unitTest
      */
     public function getCategoryByName($blogContentId, $categoryName = '', $options = [])
     {
         if (!$categoryName && $this->getBlogArchiveType() === 'category') {
             $pass = $this->_View->getRequest()->getParam('pass');
             $categoryName = $pass[count($pass) - 1];
         }
-        return ClassRegistry::init('Blog.BlogCategory')->getByName($blogContentId, $categoryName, $options);
+        $blogCategoriesModel =  TableRegistry::getTableLocator()->get('BcBlog.BlogCategories');
+        return $blogCategoriesModel->getByName($blogContentId, $categoryName, $options);
     }
 
     /**

plugins/bc-blog/tests/TestCase/View/Helper/BlogHelperTest.php

@@ -1530,23 +1530,33 @@ public function testIsSameSiteBlogContent()
     }
 
     /**
-     * testGetCategoryByName
-     * @dataProvider getCategoryByName
+     * getCategoryByName
+     * @dataProvider getCategoryByNameDataprovider
      */
     public function testGetCategoryByName($blogCategoryId, $type, $pass, $name, $expects)
     {
-        $this->markTestIncomplete('こちらのテストはまだ未確認です');
-        $this->Blog->request = $this->_getRequest('/');
-        $this->View->set('blogArchiveType', $type);
-        $this->Blog->request->params['pass'][1] = $pass;
+        //データ生成
+        BlogCategoryFactory::make([
+            'blog_content_id' => 1,
+            'name' => 'child',
+        ])->persist();
+
+        SiteFactory::make(['id' => 1])->persist();
+        $this->Blog->getView()->setRequest($this->getRequest('/')->withAttribute('currentSite', SiteFactory::get(1)));
+        $this->Blog->getView()->set('blogArchiveType', $type);
+
+        //pass param
+        $this->Blog->getView()->setRequest($this->getRequest()->withParam('pass', $pass));
         $result = $this->Blog->getCategoryByName($blogCategoryId, $name);
+
+        //check result
         $this->assertEquals($expects, (bool)$result);
     }
 
-    public static function getCategoryByName()
+    public static function getCategoryByNameDataprovider()
     {
         return [
-            [1, 'category', 'child', '', true],
+            [1, 'category', ['child'], '', true],
             [1, 'hoge', '', 'child', true],
             [1, 'hoge', '', '', false]
         ];