adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tests

Browse source
This commit is contained in:
xhs345 2016-10-27 16:10:52 -07:00
parent c59fb85da8
commit 924d382bb3
2 changed files with 74 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
View file

@ -68,6 +68,27 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->set('This is the first message');
$this->Flash->set('This is the second message');
$expected = array(
array(
'message' => 'This is the first message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array()
),
array(
'message' => 'This is the second message',
'key' => 'flash',
'element' => 'Flash/default',
'params' => array()
)
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->set('This is a test message', array( $this->Flash->set('This is a test message', array(
'element' => 'test', 'element' => 'test',
@ -83,6 +104,7 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->set('This is a test message', array('element' => 'MyPlugin.alert')); $this->Flash->set('This is a test message', array('element' => 'MyPlugin.alert'));
$expected = array( $expected = array(
@ -95,6 +117,7 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->set('This is a test message', array('key' => 'foobar')); $this->Flash->set('This is a test message', array('key' => 'foobar'));
$expected = array( $expected = array(
@ -107,6 +130,7 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.foobar'); $result = CakeSession::read('Message.foobar');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.foobar');
} }
/** /**
@ -128,6 +152,7 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
} }
/** /**
@ -150,6 +175,7 @@ class FlashComponentTest extends CakeTestCase {
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
} }
/** /**
@ -162,32 +188,41 @@ class FlashComponentTest extends CakeTestCase {
$this->Flash->success('It worked'); $this->Flash->success('It worked');
$expected = array( $expected = array(
'message' => 'It worked', array(
'key' => 'flash', 'message' => 'It worked',
'element' => 'Flash/success', 'key' => 'flash',
'params' => array() 'element' => 'Flash/success',
'params' => array()
)
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->alert('It worked', array('plugin' => 'MyPlugin')); $this->Flash->alert('It worked', array('plugin' => 'MyPlugin'));
$expected = array( $expected = array(
'message' => 'It worked', array(
'key' => 'flash', 'message' => 'It worked',
'element' => 'MyPlugin.Flash/alert', 'key' => 'flash',
'params' => array() 'element' => 'MyPlugin.Flash/alert',
'params' => array()
)
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakeSession::delete('Message.flash');
$this->Flash->error('It did not work', array('element' => 'error_thing')); $this->Flash->error('It did not work', array('element' => 'error_thing'));
$expected = array( $expected = array(
'message' => 'It did not work', array(
'key' => 'flash', 'message' => 'It did not work',
'element' => 'Flash/error', 'key' => 'flash',
'params' => array() 'element' => 'Flash/error',
'params' => array()
)
); );
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result, 'Element is ignored in magic call.'); $this->assertEquals($expected, $result, 'Element is ignored in magic call.');
CakeSession::delete('Message.flash');
} }
} }

42
lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
View file

@ -57,25 +57,37 @@ class FlashHelperTest extends CakeTestCase {
CakeSession::write(array( CakeSession::write(array(
'Message' => array( 'Message' => array(
'flash' => array( 'flash' => array(
'key' => 'flash', array(
'message' => 'This is a calling', 'key' => 'flash',
'element' => 'Flash/default', 'message' => 'This is the first Message',
'params' => array() 'element' => 'Flash/default',
'params' => array()
),
array(
'key' => 'flash',
'message' => 'This is the second Message',
'element' => 'Flash/default',
'params' => array()
)
), ),
'notification' => array( 'notification' => array(
'key' => 'notification', array(
'message' => 'Broadcast message testing', 'key' => 'notification',
'element' => 'flash_helper', 'message' => 'Broadcast message testing',
'params' => array( 'element' => 'flash_helper',
'title' => 'Notice!', 'params' => array(
'name' => 'Alert!' 'title' => 'Notice!',
'name' => 'Alert!'
)
) )
), ),
'classy' => array( 'classy' => array(
'key' => 'classy', array(
'message' => 'Recorded', 'key' => 'classy',
'element' => 'flash_classy', 'message' => 'Recorded',
'params' => array() 'element' => 'flash_classy',
'params' => array()
)
) )
) )
)); ));
@ -99,7 +111,7 @@ class FlashHelperTest extends CakeTestCase {
*/ */
public function testFlash() { public function testFlash() {
$result = $this->Flash->render(); $result = $this->Flash->render();
$expected = '<div class="message">This is a calling</div>'; $expected = '<div class="message">This is the first Message</div><div class="message">This is the second Message</div>';
$this->assertContains($expected, $result); $this->assertContains($expected, $result);
$expected = '<div id="classy-message">Recorded</div>'; $expected = '<div id="classy-message">Recorded</div>';