Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix tests that fail in PHPUnit 3.7

Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
  • Loading branch information...
commit f89fe0e1efcd77877a3fab8f13e41a7e129639f9 1 parent 805b44f
Mark Story markstory authored
Showing with 16 additions and 6 deletions.
  1. +16 −6 lib/Cake/Test/Case/Event/CakeEventManagerTest.php
22 lib/Cake/Test/Case/Event/CakeEventManagerTest.php
View
@@ -234,6 +234,10 @@ public function testDispatchWithKeyName() {
* @return void
*/
public function testDispatchReturnValue() {
+ $this->skipIf(
+ version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+ 'These tests fail in PHPUnit 3.6'
+ );
$manager = new CakeEventManager;
$listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener');
@@ -241,11 +245,12 @@ public function testDispatchReturnValue() {
$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
$event = new CakeEvent('fake.event');
- $firstStep = clone $event;
$listener->expects($this->at(0))->method('listenerFunction')
- ->with($firstStep)
+ ->with($event)
->will($this->returnValue('something special'));
- $anotherListener->expects($this->at(0))->method('listenerFunction')->with($event);
+ $anotherListener->expects($this->at(0))
+ ->method('listenerFunction')
+ ->with($event);
$manager->dispatch($event);
$this->assertEquals('something special', $event->result);
}
@@ -256,6 +261,11 @@ public function testDispatchReturnValue() {
* @return void
*/
public function testDispatchFalseStopsEvent() {
+ $this->skipIf(
+ version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+ 'These tests fail in PHPUnit 3.6'
+ );
+
$manager = new CakeEventManager;
$listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener');
@@ -263,11 +273,11 @@ public function testDispatchFalseStopsEvent() {
$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
$event = new CakeEvent('fake.event');
- $originalEvent = clone $event;
$listener->expects($this->at(0))->method('listenerFunction')
- ->with($originalEvent)
+ ->with($event)
->will($this->returnValue(false));
- $anotherListener->expects($this->never())->method('listenerFunction');
+ $anotherListener->expects($this->never())
+ ->method('listenerFunction');
$manager->dispatch($event);
$this->assertTrue($event->isStopped());
}
Please sign in to comment.
Something went wrong with that request. Please try again.