Fixed test that was never supposed to work

cakephp · Mar 24, 2016 · abf063e · abf063e
1 parent a2ac7da
commit abf063e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 25 deletions.
diff --git a/tests/TestCase/Console/ShellTest.php b/tests/TestCase/Console/ShellTest.php
@@ -962,7 +962,11 @@ public function testRunCommandWithMissingMethodInSubcommands()
      */
     public function testRunCommandBaseclassMethod()
     {
-        $shell = $this->getMock('Cake\Console\Shell', ['startup', 'getOptionParser', 'out'], [], '', false);
+        $shell = $this->getMockBuilder('Cake\Console\Shell')
+            ->setMethods(['startup', 'getOptionParser', 'out', 'hr'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $shell->io($this->getMock('Cake\Console\ConsoleIo'));
         $parser = $this->getMock('Cake\Console\ConsoleOptionParser', [], [], '', false);
 
@@ -982,7 +986,10 @@ public function testRunCommandBaseclassMethod()
      */
     public function testRunCommandMissingMethod()
     {
-        $shell = $this->getMock('Cake\Console\Shell', ['startup', 'getOptionParser', 'out'], [], '', false);
+        $shell = $this->getMockBuilder('Cake\Console\Shell')
+            ->setMethods(['startup', 'getOptionParser', 'out', 'hr'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $shell->io($this->getMock('Cake\Console\ConsoleIo'));
         $parser = $this->getMock('Cake\Console\ConsoleOptionParser', [], [], '', false);
 

diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -1450,6 +1450,7 @@ public function testStatelessAuthNoRedirect()
      */
     public function testStatelessFollowedByStatefulAuth()
     {
+        $this->Auth->response = $this->getMock('Cake\Network\Response', ['stop', 'statusCode', 'send']);
         $event = new Event('Controller.startup', $this->Controller);
         $this->Auth->authenticate = ['Basic', 'Form'];
         $this->Controller->request['action'] = 'add';

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -522,29 +522,17 @@ public function testRedirectBeforeRedirectModifyingStatusCode()
         $this->assertEquals(302, $response->statusCode());
     }
 
-    /**
-     * test that beforeRedirect callback returning false in controller
-     *
-     * @return void
-     */
-    public function testRedirectBeforeRedirectListenerReturnFalse()
+    public function testRedirectBeforeRedirectListenerReturnResponse()
     {
-        $Response = $this->getMock('Cake\Network\Response', ['stop', 'header']);
+        $Response = $this->getMock('Cake\Network\Response', ['stop', 'header', 'statusCode']);
         $Controller = new Controller(null, $Response);
 
-        $Controller->eventManager()->attach(function ($event, $url, $response) {
-            return false;
-        }, 'Controller.beforeRedirect');
-
-        $Controller->response->expects($this->never())
-            ->method('stop');
-        $Controller->response->expects($this->never())
-            ->method('header');
-        $Controller->response->expects($this->never())
-            ->method('statusCode');
+        $Controller->eventManager()->on('Controller.beforeRedirect', function ($event, $url, $response) {
+            return new Response;
+        });
 
         $result = $Controller->redirect('http://cakephp.org');
-        $this->assertNull($result);
+        $this->assertInstanceOf(Response::class, $result);
     }
 
     /**

diff --git a/tests/TestCase/ORM/Association/BelongsToTest.php b/tests/TestCase/ORM/Association/BelongsToTest.php
@@ -287,7 +287,7 @@ public function testCascadeDelete()
      */
     public function testSaveAssociatedOnlyEntities()
     {
-        $mock = $this->getMock('Cake\ORM\Table', [], [], '', false);
+        $mock = $this->getMock('Cake\ORM\Table', ['saveAssociated'], [], '', false);
         $config = [
             'sourceTable' => $this->client,
             'targetTable' => $mock,

diff --git a/tests/TestCase/ORM/Association/HasManyTest.php b/tests/TestCase/ORM/Association/HasManyTest.php
@@ -485,7 +485,7 @@ public function testCascadeDeleteCallbacks()
      */
     public function testSaveAssociatedOnlyEntities()
     {
-        $mock = $this->getMock('Cake\ORM\Table', [], [], '', false);
+        $mock = $this->getMock('Cake\ORM\Table', ['saveAssociated'], [], '', false);
         $config = [
             'sourceTable' => $this->author,
             'targetTable' => $mock,

diff --git a/tests/TestCase/ORM/Association/HasOneTest.php b/tests/TestCase/ORM/Association/HasOneTest.php
@@ -221,7 +221,7 @@ public function testAttachToMultiPrimaryKeyMistmatch()
      */
     public function testSaveAssociatedOnlyEntities()
     {
-        $mock = $this->getMock('Cake\ORM\Table', [], [], '', false);
+        $mock = $this->getMock('Cake\ORM\Table', ['saveAssociated'], [], '', false);
         $config = [
             'sourceTable' => $this->user,
             'targetTable' => $mock,

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -818,7 +818,7 @@ public function testConstructorWithClean()
     public function testConstructorWithMarkNew()
     {
         $entity = $this->getMockBuilder('\Cake\ORM\Entity')
-            ->setMethods(['isNew'])
+            ->setMethods(['isNew', 'clean'])
             ->disableOriginalConstructor()
             ->getMock();
         $entity->expects($this->never())->method('clean');

diff --git a/tests/TestCase/Routing/Filter/AssetFilterTest.php b/tests/TestCase/Routing/Filter/AssetFilterTest.php
@@ -76,7 +76,7 @@ public function testNotModified()
         $this->assertEquals(200, $response->statusCode());
         $this->assertEquals($time->format('D, j M Y H:i:s') . ' GMT', $response->modified());
 
-        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', 'checkNotModified']);
+        $response = $this->getMock('Cake\Network\Response', ['_sendHeader', 'checkNotModified', 'send']);
         $request = new Request('test_theme/img/cake.power.gif');
 
         $response->expects($this->once())->method('checkNotModified')