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 failing tests

Browse source 
fixing...
This commit is contained in:
Highstrike 2015-06-25 13:40:50 +03:00
parent 8257100f54
commit a9d77d26f0
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
View file

@ -197,7 +197,6 @@ class ProjectTaskTest extends CakeTestCase {
'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' => 'empty',
'Test' . DS . 'Fixture' => 'empty',
'Vendor' => 'empty',
'View' . DS . 'Elements' => 'empty',
'View' . DS . 'Scaffolds' => 'empty',
'tmp' . DS . 'cache' . DS . 'models' => 'empty',
'tmp' . DS . 'cache' . DS . 'persistent' => 'empty',

30
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
View file

@ -165,7 +165,7 @@ class AuthTestController extends Controller {
*
* @var array
*/
public $components = array('Session', 'Auth');
public $components = array('Session', 'Flash', 'Auth');
/**
* testUrl property
@ -1093,9 +1093,9 @@ class AuthComponentTest extends CakeTestCase {
array('on', 'redirect'),
array($CakeRequest, $CakeResponse)
);
$this->Auth->Session = $this->getMock(
'SessionComponent',
array('setFlash'),
$this->Auth->Flash = $this->getMock(
'FlashComponent',
array('set'),
array($Controller->Components)
);
@ -1105,8 +1105,8 @@ class AuthComponentTest extends CakeTestCase {
$Controller->expects($this->once())
->method('redirect')
->with($this->equalTo($expected));
$this->Auth->Session->expects($this->once())
->method('setFlash');
$this->Auth->Flash->expects($this->once())
->method('set');
$this->Auth->startup($Controller);
}
@ -1132,9 +1132,9 @@ class AuthComponentTest extends CakeTestCase {
array('on', 'redirect'),
array($CakeRequest, $CakeResponse)
);
$this->Auth->Session = $this->getMock(
'SessionComponent',
array('setFlash'),
$this->Auth->Flash = $this->getMock(
'FlashComponent',
array('set'),
array($Controller->Components)
);
@ -1144,8 +1144,8 @@ class AuthComponentTest extends CakeTestCase {
$Controller->expects($this->once())
->method('redirect')
->with($this->equalTo($expected));
$this->Auth->Session->expects($this->never())
->method('setFlash');
$this->Auth->Flash->expects($this->never())
->method('set');
$this->Auth->startup($Controller);
}
@ -1514,10 +1514,10 @@ class AuthComponentTest extends CakeTestCase {
* @return void
*/
public function testFlashSettings() {
$this->Auth->Session = $this->getMock('SessionComponent', array(), array(), '', false);
$this->Auth->Session->expects($this->once())
->method('setFlash')
->with('Auth failure', 'custom', array(1), 'auth-key');
$this->Auth->Flash = $this->getMock('FlashComponent', array(), array(), '', false);
$this->Auth->Flash->expects($this->once())
->method('set')
->with('Auth failure', array('element' => 'custom', 'params' => array(1), 'key' => 'auth-key'));
$this->Auth->flash = array(
'element' => 'custom',