Browse Source

Fix test not passing

chinpei215 8 years ago
parent
commit
480b118090

+ 3 - 1
src/Event/EventManager.php

@@ -584,7 +584,9 @@ class EventManager
             $count = count($this->_eventList);
             for ($i = 0; $i < $count; $i++) {
                 $event = $this->_eventList[$i];
-                $properties['_dispatchedEvents'][] = $event->getName() . ' with subject ' . get_class($event->getSubject());
+                $subject = $event->getSubject();
+                $properties['_dispatchedEvents'][] = $event->getName() . ' with ' .
+                    (is_object($subject) ? 'subject ' . get_class($subject) : 'no subject');
             }
         } else {
             $properties['_dispatchedEvents'] = null;

+ 1 - 0
tests/TestCase/Core/ConfigureTest.php

@@ -64,6 +64,7 @@ class ConfigureTest extends TestCase
             unlink(TMP . 'cache/persistent/test.php');
         }
         Configure::drop('test');
+        Cache::enable();
     }
 
     /**

+ 1 - 0
tests/TestCase/Database/ConnectionTest.php

@@ -58,6 +58,7 @@ class ConnectionTest extends TestCase
     {
         Log::reset();
         $this->connection->enableSavePoints(false);
+        $this->connection->setLogger(null);
         unset($this->connection);
         parent::tearDown();
     }

+ 2 - 0
tests/TestCase/Database/Driver/SqlserverTest.php

@@ -143,6 +143,7 @@ class SqlserverTest extends TestCase
         $expected['failoverPartner'] = null;
         $expected['loginTimeout'] = null;
         $expected['multiSubnetFailover'] = null;
+        $expected['port'] = null;
 
         $connection = $this->getMockBuilder('stdClass')
             ->setMethods(['exec', 'quote'])
@@ -206,6 +207,7 @@ class SqlserverTest extends TestCase
         $expected['failoverPartner'] = null;
         $expected['loginTimeout'] = null;
         $expected['multiSubnetFailover'] = null;
+        $expected['port'] = null;
 
         $driver->expects($this->once())->method('_connect')
             ->with($dsn, $expected);

+ 1 - 1
tests/TestCase/Event/EventManagerTest.php

@@ -959,7 +959,7 @@ class EventManagerTest extends TestCase
                 '_trackEvents' => true,
                 '_generalManager' => '(object) EventManager',
                 '_dispatchedEvents' => [
-                    'example with subject Cake\Event\EventManager'
+                    'example with no subject',
                 ],
             ],
             $eventManager->__debugInfo()