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

Added test to show (deprecated?) support of string status codes in redirect().

Browse source 
Fixed fail on string status codes in redirect().

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7410 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
TommyO 2008-08-01 11:27:53 +00:00
parent 8284872b82
commit 570145d568
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/controller/controller.php
View file

@ -540,7 +540,7 @@ class Controller extends Object {
}
if (isset($codes[$status])) {
$code = $status = $codes[$status];
$code = $msg = $codes[$status];
if (is_numeric($status)) {
$code = $status;
}

20
cake/tests/cases/libs/controller/controller.test.php
View file

@ -323,7 +323,7 @@ class ControllerTest extends CakeTestCase {
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
$this->assertEqual($results, array(1, 2, 3));
$Controller->passedArgs = array('sort' => 'ControllerPost.author_id', 'direction' => 'allYourBase');
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
$this->assertEqual($Controller->ControllerPost->lastQuery['order'][0], array('ControllerPost.author_id' => 'asc'));
@ -457,21 +457,21 @@ class ControllerTest extends CakeTestCase {
$result = $Controller->render('/elements/test_element');
$this->assertPattern('/this is the test element/', $result);
$Controller = new TestController();
$Controller->constructClasses();
$Controller->ControllerComment->validationErrors = array('title' => 'tooShort');
$expected = $Controller->ControllerComment->validationErrors;
ClassRegistry::flush();
$Controller->viewPath = 'posts';
$result = $Controller->render('index');
$View = ClassRegistry::getObject('view');
$this->assertTrue(isset($View->validationErrors['ControllerComment']));
$this->assertEqual($expected, $View->validationErrors['ControllerComment']);
$Controller->ControllerComment->validationErrors = array();
ClassRegistry::flush();
ClassRegistry::flush();
}
/**
* testToBeInheritedGuardmethods method
@ -539,6 +539,7 @@ class ControllerTest extends CakeTestCase {
Mock::generatePartial('Controller', 'MockController', array('header'));
App::import('Helper', 'Cache');
// $codes = array_merge($codes, array_flip($codes));
foreach ($codes as $code => $msg) {
$MockController =& new MockController();
$MockController->components = array('Test');
@ -547,6 +548,15 @@ class ControllerTest extends CakeTestCase {
$MockController->expectCallCount('header', 2);
$MockController->redirect($url, (int) $code, false);
}
$codes = array_flip($codes);
foreach ($codes as $code => $msg) {
$MockController =& new MockController();
$MockController->components = array('Test');
$MockController->Component =& new Component();
$MockController->Component->init($MockController);
$MockController->expectCallCount('header', 2);
$MockController->redirect($url, $code, false);
}
}
/**
* testMergeVars method