Merge pull request #601 from raul338/missing-traits

Add SerializeTrait to View and Edit Actions
FriendsOfCake · Sep 29, 2018 · 8129e24 · 8129e24
2 parents 2d21b63 + 5a8f1a9
commit 8129e24
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 0 deletions.
diff --git a/src/Action/EditAction.php b/src/Action/EditAction.php
@@ -6,6 +6,7 @@
 use Crud\Traits\FindMethodTrait;
 use Crud\Traits\RedirectTrait;
 use Crud\Traits\SaveMethodTrait;
+use Crud\Traits\SerializeTrait;
 use Crud\Traits\ViewTrait;
 use Crud\Traits\ViewVarTrait;
 
@@ -21,6 +22,7 @@ class EditAction extends BaseAction
     use FindMethodTrait;
     use RedirectTrait;
     use SaveMethodTrait;
+    use SerializeTrait;
     use ViewTrait;
     use ViewVarTrait;
 

diff --git a/src/Action/ViewAction.php b/src/Action/ViewAction.php
@@ -2,6 +2,7 @@
 namespace Crud\Action;
 
 use Crud\Traits\FindMethodTrait;
+use Crud\Traits\SerializeTrait;
 use Crud\Traits\ViewTrait;
 use Crud\Traits\ViewVarTrait;
 
@@ -15,6 +16,7 @@ class ViewAction extends BaseAction
 {
 
     use FindMethodTrait;
+    use SerializeTrait;
     use ViewTrait;
     use ViewVarTrait;
 

diff --git a/tests/TestCase/Listener/ApiListenerTest.php b/tests/TestCase/Listener/ApiListenerTest.php
@@ -431,6 +431,82 @@ public function testEnsureSerializeWithViewVar()
         $this->callProtectedMethod('_ensureSerialize', [], $listener);
     }
 
+    /**
+     * Data provider for testExpandPath
+     *
+     * @return array
+     */
+    public function dataSerializeTraitActions()
+    {
+        return [
+            'View Action' => ['\Crud\Action\ViewAction'],
+            'Index Action' => ['\Crud\Action\IndexAction'],
+            'Edit Action' => ['\Crud\Action\EditAction'],
+            'Add Action' => ['\Crud\Action\AddAction'],
+        ];
+    }
+
+    /**
+     * Test SerializeTrait
+     *
+     * @dataProvider dataSerializeTraitActions
+     * @return void
+     */
+    public function testEnsureSerializeWithSerializeTrait($action)
+    {
+        $listener = $this
+            ->getMockBuilder('\Crud\Listener\ApiListener')
+            ->setMethods(['_action', '_controller'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $action = $this
+            ->getMockBuilder($action)
+            ->setMethods(['setConfig', 'getConfig', 'viewVar'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $controller = $this
+            ->getMockBuilder('\Cake\Controller\Controller')
+            ->setMethods(['set'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $i = 0;
+        $listener
+            ->expects($this->at($i++))
+            ->method('_controller')
+            ->will($this->returnValue($controller));
+        $listener
+            ->expects($this->at($i++))
+            ->method('_action')
+            ->will($this->returnValue($action));
+        $i = 0;
+        $action
+            ->expects($this->at($i++))
+            ->method('setConfig')
+            ->with('serialize', ['something']);
+        $action
+            ->expects($this->at($i++))
+            ->method('viewVar')
+            ->will($this->returnValue(null));
+        $action
+            ->expects($this->once())
+            ->method('getConfig')
+            ->with('serialize')
+            ->will($this->returnValue(['something']));
+        $controller
+            ->expects($this->once())
+            ->method('set')
+            ->with('_serialize', ['success', 'something', 'data' => null]);
+
+        $this->setReflectionClassInstance($action);
+        $this->callProtectedMethod('serialize', [['something']], $action);
+
+        $this->setReflectionClassInstance($listener);
+        $this->callProtectedMethod('_ensureSerialize', [], $listener);
+    }
+
     /**
      * testEnsureSerializeAlreadySet
      *