Fixing more tests for phpunit 4.0

cakephp · Mar 10, 2014 · eca2bfd · eca2bfd
1 parent 220578a
commit eca2bfd
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -368,7 +368,7 @@ public function testRender() {
  */
 	public function testBeforeRenderCallbackChangingViewClass() {
 		Configure::write('App.namespace', 'TestApp');
-		$Controller = new Controller($this->getMock('Cake\Network\Request'), new Response());
+		$Controller = new Controller(new Request, new Response());
 
 		$Controller->getEventManager()->attach(function ($event) {
 			$controller = $event->subject();
@@ -392,7 +392,7 @@ public function testBeforeRenderCallbackChangingViewClass() {
  * @return void
  */
 	public function testBeforeRenderEventCancelsRender() {
-		$Controller = new Controller($this->getMock('Cake\Network\Request'), new Response());
+		$Controller = new Controller(new Request, new Response());
 
 		$Controller->getEventManager()->attach(function ($event) {
 			return false;
@@ -567,8 +567,7 @@ public function testMergeVarsNotGreedy() {
  * @return void
  */
 	public function testReferer() {
-		$request = $this->getMock('Cake\Network\Request');
-
+		$request = $this->getMock('Cake\Network\Request', ['referer']);
 		$request->expects($this->any())->method('referer')
 			->with(true)
 			->will($this->returnValue('/posts/index'));
@@ -577,12 +576,15 @@ public function testReferer() {
 		$result = $Controller->referer(null, true);
 		$this->assertEquals('/posts/index', $result);
 
+		$request = $this->getMock('Cake\Network\Request', ['referer']);
+		$request->expects($this->any())->method('referer')
+			->with(true)
+			->will($this->returnValue('/'));
 		$Controller = new Controller($request);
-		$request->setReturnValue('referer', '/', array(true));
 		$result = $Controller->referer(array('controller' => 'posts', 'action' => 'index'), true);
 		$this->assertEquals('/posts/index', $result);
 
-		$request = $this->getMock('Cake\Network\Request');
+		$request = $this->getMock('Cake\Network\Request', ['referer']);
 
 		$request->expects($this->any())->method('referer')
 			->with(false)