adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-05-07 08:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding additional case for Router::normalize() and Controller::referer() to show is invalid

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7463 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-08-13 18:07:52 +00:00
parent 0b8d7027ec
commit 074ede4639
2 changed files with 23 additions and 11 deletions
cake/tests/cases/libs
controller
controller.test.php
router.test.php

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

@ -263,16 +263,18 @@ class ControllerTest extends CakeTestCase {
* @return void * @return void
*/ */
function testPersistent() { function testPersistent() {
Configure::write('Cache.disable', false);
$Controller =& new Controller(); $Controller =& new Controller();
$Controller->modelClass = 'ControllerPost'; $Controller->modelClass = 'ControllerPost';
$Controller->persistModel = true; $Controller->persistModel = true;
$Controller->constructClasses(); $Controller->constructClasses();
$this->assertTrue(file_exists(CACHE . 'persistent' . DS .'controllerpost.php')); $this->assertTrue(file_exists(CACHE . 'persistent' . DS .'controllerpost.php'));
$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost')); $this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
unlink(CACHE . 'persistent' . DS . 'controllerpost.php'); @unlink(CACHE . 'persistent' . DS . 'controllerpost.php');
unlink(CACHE . 'persistent' . DS . 'controllerpostregistry.php'); @unlink(CACHE . 'persistent' . DS . 'controllerpostregistry.php');
unset($Controller); unset($Controller);
Configure::write('Cache.disable', true);
} }
/** /**
* testPaginate method * testPaginate method
@ -628,6 +630,13 @@ class ControllerTest extends CakeTestCase {
$result = $Controller->referer(null, false); $result = $Controller->referer(null, false);
$expected = '/some/path'; $expected = '/some/path';
$this->assertIdentical($result, $expected); $this->assertIdentical($result, $expected);
$Controller->webroot = '/recipe/';
$_SERVER['HTTP_REFERER'] = FULL_BASE_URL.$Controller->webroot.'recipes/add';
$result = $Controller->referer();
$expected = '/recipes/add';
$this->assertIdentical($result, $expected);
} }
/** /**
* testSetAction method * testSetAction method

21
cake/tests/cases/libs/router.test.php
View file

@ -255,6 +255,9 @@ class RouterTest extends CakeTestCase {
$result = Router::normalize('/users/login/scope://foo'); $result = Router::normalize('/users/login/scope://foo');
$this->assertEqual($result, '/users/login/scope:/foo'); $this->assertEqual($result, '/users/login/scope:/foo');
$result = Router::normalize('/recipe/recipes/add');
$this->assertEqual($result, '/recipe/recipes/add');
} }
/** /**
* testUrlGeneration method * testUrlGeneration method
@ -1375,36 +1378,36 @@ class RouterTest extends CakeTestCase {
$result = Router::prefixes(); $result = Router::prefixes();
$expected = array('admin'); $expected = array('admin');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
Router::reload(); Router::reload();
$prefixParams = array('prefix' => 'members', 'members' => true); $prefixParams = array('prefix' => 'members', 'members' => true);
Router::connect('/members/:controller', $prefixParams); Router::connect('/members/:controller', $prefixParams);
Router::connect('/members/:controller/:action', $prefixParams); Router::connect('/members/:controller/:action', $prefixParams);
Router::connect('/members/:controller/:action/*', $prefixParams); Router::connect('/members/:controller/:action/*', $prefixParams);
Router::setRequestInfo(array( Router::setRequestInfo(array(
array('controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null), array('controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
array('base' => '/base', 'here' => '/', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array()) array('base' => '/base', 'here' => '/', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
)); ));
$result = Router::parse('/members/posts/index'); $result = Router::parse('/members/posts/index');
$expected = array('pass' => array(), 'named' => array(), 'prefix' => 'members', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'members' => true); $expected = array('pass' => array(), 'named' => array(), 'prefix' => 'members', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'members' => true);
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', 'page' => 2)); $result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', 'page' => 2));
$expected = '/base/members/posts/index/page:2'; $expected = '/base/members/posts/index/page:2';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = Router::url(array('members' => true, 'controller' => 'users', 'action' => 'add')); $result = Router::url(array('members' => true, 'controller' => 'users', 'action' => 'add'));
$expected = '/base/members/users/add'; $expected = '/base/members/users/add';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = Router::parse('/posts/index'); $result = Router::parse('/posts/index');
$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'index'); $expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'index');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/** /**
* Tests URL generation with flags and prefixes in and out of context * Tests URL generation with flags and prefixes in and out of context
* *