mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-04 02:22:39 +00:00
Adding Router parsing test for Ticket #3074
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5538 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
b222afd20b
commit
382235ffbf
1 changed files with 6 additions and 9 deletions
|
@ -28,9 +28,6 @@
|
|||
*/
|
||||
uses('router', 'debugger');
|
||||
|
||||
if (!defined('CAKE_ADMIN')) {
|
||||
define('CAKE_ADMIN', 'admin');
|
||||
}
|
||||
/**
|
||||
* Short description for class.
|
||||
*
|
||||
|
@ -41,7 +38,6 @@ class RouterTest extends UnitTestCase {
|
|||
|
||||
function setUp() {
|
||||
$this->router =& Router::getInstance();
|
||||
//$this->router->reload();
|
||||
}
|
||||
|
||||
function testReturnedInstanceReference() {
|
||||
|
@ -91,11 +87,6 @@ class RouterTest extends UnitTestCase {
|
|||
|
||||
function testRouterIdentity() {
|
||||
$this->router->reload();
|
||||
$this->router->__admin = array(
|
||||
'/:' . CAKE_ADMIN . '/:controller/:action/*',
|
||||
'/^(?:\/(?:(' . CAKE_ADMIN . ')(?:\\/([a-zA-Z0-9_\\-\\.\\;\\:]+)(?:\\/([a-zA-Z0-9_\\-\\.\\;\\:]+)(?:[\\/\\?](.*))?)?)?))[\/]*$/',
|
||||
array(CAKE_ADMIN, 'controller', 'action'), array()
|
||||
);
|
||||
$router2 = new Router();
|
||||
$this->assertEqual(get_object_vars($this->router), get_object_vars($router2));
|
||||
}
|
||||
|
@ -376,6 +367,12 @@ class RouterTest extends UnitTestCase {
|
|||
$this->router->connect('/page/*', array('controller' => 'test'));
|
||||
$result = $this->router->parse('/page/my-page');
|
||||
$expected = array('pass' => array('my-page'), 'plugin' => null, 'controller' => 'test', 'action' => 'index');
|
||||
|
||||
$this->router->reload();
|
||||
$this->router->connect('/:language/contact', array('language' => 'eng', 'plugin' => 'contact', 'controller' => 'contact', 'action' => 'index'), array('language' => '[a-z]{3}'));
|
||||
$result = $this->router->parse('/eng/contact');
|
||||
$expected = array('pass' => array(), 'language' => 'eng', 'plugin' => 'contact', 'controller' => 'contact', 'action' => 'index');
|
||||
$this->assertEqual($result, $expected);
|
||||
}
|
||||
|
||||
function testAdminRouting() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue