Update requestAction() test methods.

These methods instead of returning arrays now set the reponse body with serialized data.
cakephp · Mar 28, 2014 · 5ad0555 · 5ad0555
1 parent 08477e8
commit 5ad0555
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 20 deletions.
diff --git a/tests/TestCase/Routing/RequestActionTraitTest.php b/tests/TestCase/Routing/RequestActionTraitTest.php
@@ -75,7 +75,7 @@ public function testRequestAction() {
 		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/request_action/paginate_request_action');
-		$this->assertTrue($result);
+		$this->assertNull($result);
 
 		$result = $this->object->requestAction('/request_action/normal_request_action');
 		$expected = 'Hello World';
@@ -158,13 +158,13 @@ public function testRequestActionArray() {
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'paginate_request_action')
 		);
-		$this->assertTrue($result);
+		$this->assertNull($result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'paginate_request_action'),
 			array('pass' => array(5))
 		);
-		$this->assertTrue($result);
+		$this->assertNull($result);
 	}
 
 /**
@@ -186,10 +186,11 @@ public function testRequestActionRemoveReturnParam() {
  */
 	public function testRequestActionParamParseAndPass() {
 		$result = $this->object->requestAction('/request_action/params_pass');
-		$this->assertEquals('request_action/params_pass', $result->url);
-		$this->assertEquals('request_action', $result['controller']);
-		$this->assertEquals('params_pass', $result['action']);
-		$this->assertEquals(null, $result['plugin']);
+		$result = unserialize($result);
+		$this->assertEquals('request_action/params_pass', $result['url']);
+		$this->assertEquals('request_action', $result['params']['controller']);
+		$this->assertEquals('params_pass', $result['params']['action']);
+		$this->assertNull($result['params']['plugin']);
 	}
 
 /**
@@ -203,13 +204,14 @@ public function testRequestActionNoPostPassing() {
 			'item' => 'value'
 		);
 		$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'post_pass'));
-		$expected = null;
+		$result = unserialize($result);
 		$this->assertEmpty($result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'post_pass'),
 			array('post' => $_POST)
 		);
+		$result = unserialize($result);
 		$expected = $_POST;
 		$this->assertEquals($expected, $result);
 	}
@@ -228,18 +230,21 @@ public function testRequestActionWithQueryString() {
 			['controller' => 'request_action', 'action' => 'query_pass'],
 			['query' => $query]
 		);
+		$result = unserialize($result);
 		$this->assertEquals($query, $result);
 
 		$result = $this->object->requestAction([
 			'controller' => 'request_action',
 			'action' => 'query_pass',
 			'?' => $query
 		]);
+		$result = unserialize($result);
 		$this->assertEquals($query, $result);
 
 		$result = $this->object->requestAction(
 			'/request_action/query_pass?page=3&sort=body'
 		);
+		$result = unserialize($result);
 		$expected = ['page' => 3, 'sort' => 'body'];
 		$this->assertEquals($expected, $result);
 	}
@@ -257,12 +262,14 @@ public function testRequestActionPostWithData() {
 			array('controller' => 'request_action', 'action' => 'post_pass'),
 			array('post' => $data)
 		);
+		$result = unserialize($result);
 		$this->assertEquals($data, $result);
 
 		$result = $this->object->requestAction(
 			'/request_action/post_pass',
 			array('post' => $data)
 		);
+		$result = unserialize($result);
 		$this->assertEquals($data, $result);
 	}
 
@@ -275,13 +282,15 @@ public function testRequestActionGetParameters() {
 		$result = $this->object->requestAction(
 			'/request_action/params_pass?get=value&limit=5'
 		);
-		$this->assertEquals('value', $result->query['get']);
+		$result = unserialize($result);
+		$this->assertEquals('value', $result['query']['get']);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'params_pass'),
 			array('query' => array('get' => 'value', 'limit' => 5))
 		);
-		$this->assertEquals('value', $result->query['get']);
+		$result = unserialize($result);
+		$this->assertEquals('value', $result['query']['get']);
 	}
 
 }
diff --git a/tests/test_app/Plugin/TestPlugin/Controller/TestsController.php b/tests/test_app/Plugin/TestPlugin/Controller/TestsController.php
@@ -34,7 +34,7 @@ public function index() {
 	}
 
 	public function some_method() {
-		return 25;
+		$this->response->body(25);
 	}
 
 }
diff --git a/tests/test_app/TestApp/Controller/OrangeSessionTestController.php b/tests/test_app/TestApp/Controller/OrangeSessionTestController.php
@@ -35,9 +35,9 @@ class OrangeSessionTestController extends Controller {
 /**
  * session_id method
  *
- * @return string
+ * @return void
  */
 	public function session_id() {
-		return $this->Session->id();
+		$this->response->body($this->Session->id());
 	}
 }
diff --git a/tests/test_app/TestApp/Controller/RequestActionController.php b/tests/test_app/TestApp/Controller/RequestActionController.php
@@ -87,7 +87,7 @@ public function paginate_request_action() {
  * @return array
  */
 	public function post_pass() {
-		return $this->request->data;
+		$this->response->body(serialize($this->request->data));
 	}
 
 /**
@@ -96,16 +96,20 @@ public function post_pass() {
  * @return array
  */
 	public function query_pass() {
-		return $this->request->query;
+		$this->response->body(serialize($this->request->query));
 	}
 
 /**
  * test param passing and parsing.
  *
- * @return array
+ * @return void
  */
 	public function params_pass() {
-		return $this->request;
+		$this->response->body(serialize([
+			'params' => $this->request->params,
+			'query' => $this->request->query,
+			'url' => $this->request->url
+		]));
 	}
 
 /**

diff --git a/tests/test_app/TestApp/Controller/SessionTestController.php b/tests/test_app/TestApp/Controller/SessionTestController.php
@@ -31,9 +31,9 @@ class SessionTestController extends Controller {
 /**
  * session_id method
  *
- * @return string
+ * @return void
  */
 	public function session_id() {
-		return $this->Session->id();
+		$this->response->body($this->Session->id());
 	}
 }
diff --git a/tests/test_app/TestApp/Controller/TestsAppsController.php b/tests/test_app/TestApp/Controller/TestsAppsController.php
@@ -36,7 +36,7 @@ public function index() {
 	}
 
 	public function some_method() {
-		return 5;
+		$this->response->body(5);
 	}
 
 	public function set_action() {