Fixing session usage in ControllerTestCase

cakephp · May 18, 2014 · abddd99 · abddd99
1 parent d68d5d5
commit abddd99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/TestSuite/ControllerTestCase.php b/src/TestSuite/ControllerTestCase.php
@@ -19,6 +19,7 @@
 use Cake\Core\App;
 use Cake\Error;
 use Cake\Event\Event;
+use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\DispatcherFilter;
 use Cake\Routing\Router;
@@ -246,6 +247,7 @@ protected function _testAction($url = '', $options = array()) {
 			'url' => $url,
 			'cookies' => $options['cookies'],
 			'query' => $options['query'],
+			'session' => new Session()
 		);
 		if (is_array($options['data'])) {
 			$requestData['post'] = $options['data'];

diff --git a/tests/TestCase/Routing/DispatcherTest.php b/tests/TestCase/Routing/DispatcherTest.php
@@ -23,6 +23,7 @@
 use Cake\Event\Event;
 use Cake\Network\Request;
 use Cake\Network\Response;
+use Cake\Network\Session;
 use Cake\Routing\Dispatcher;
 use Cake\Routing\Filter\ControllerFactoryFilter;
 use Cake\Routing\Router;
@@ -473,7 +474,8 @@ public function testAfterDispatchReplaceResponse() {
 				'controller' => 'posts',
 				'action' => 'index',
 				'pass' => [],
-			]
+			],
+			'session' => new Session
 		]);
 		$this->dispatcher->addFilter($filter);
 		$this->dispatcher->dispatch($request, $response);

diff --git a/tests/TestCase/TestSuite/ControllerTestCaseTest.php b/tests/TestCase/TestSuite/ControllerTestCaseTest.php
@@ -146,18 +146,12 @@ public function testGenerate() {
 			'models' => array('Posts'),
 			'components' => array(
 				'RequestHandler' => array('isPut'),
-				'Session'
 			)
 		));
 		$Posts->RequestHandler->expects($this->once())
 			->method('isPut')
 			->will($this->returnValue(true));
 		$this->assertTrue($Posts->RequestHandler->isPut());
-
-		$Posts->Auth->Session->expects($this->any())
-			->method('write')
-			->will($this->returnValue('written!'));
-		$this->assertEquals('written!', $Posts->Auth->Session->write('something'));
 	}
 
 /**