deon/lnkohana
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Kohana v3.3.2

Browse Source
This commit is contained in:
Deon George
2014-09-06 23:43:07 +10:00
parent f96694b18f
commit 8888719653
236 changed files with 1685 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
system/tests/kohana/RouteTest.php
View File

@@ -361,34 +361,6 @@ class Kohana_RouteTest extends Unittest_TestCase
),
'',
),
/**
* Specifying this should cause controller and action to show up
* refs #4113
*/
array(
'(<controller>(/<action>(/<id>)))',
NULL,
array('controller' => 'welcome', 'action' => 'index'),
'Welcome',
'index',
'welcome/index/1',
array(
'id' => '1'
),
'',
),
array(
'<controller>(/<action>(/<id>))',
NULL,
array('controller' => 'welcome', 'action' => 'index'),
'Welcome',
'index',
'welcome/foo',
array(
'action' => 'foo',
),
'welcome',
),
);
}
@@ -427,6 +399,107 @@ class Kohana_RouteTest extends Unittest_TestCase
$this->assertSame($default_uri, $route->uri());
}
/**
* Provider for test_optional_groups_containing_specified_params
*
* @return array
*/
public function provider_optional_groups_containing_specified_params()
{
return array(
/**
* Specifying this should cause controller and action to show up
* refs #4113
*/
array(
'(<controller>(/<action>(/<id>)))',
array('controller' => 'welcome', 'action' => 'index'),
array('id' => '1'),
'welcome/index/1',
),
array(
'<controller>(/<action>(/<id>))',
array('controller' => 'welcome', 'action' => 'index'),
array('action' => 'foo'),
'welcome/foo',
),
array(
'<controller>(/<action>(/<id>))',
array('controller' => 'welcome', 'action' => 'index'),
array('action' => 'index'),
'welcome',
),
/**
* refs #4630
*/
array(
'api(/<version>)/const(/<id>)(/<custom>)',
array('version' => 1),
NULL,
'api/const',
),
array(
'api(/<version>)/const(/<id>)(/<custom>)',
array('version' => 1),
array('version' => 9),
'api/9/const',
),
array(
'api(/<version>)/const(/<id>)(/<custom>)',
array('version' => 1),
array('id' => 2),
'api/const/2',
),
array(
'api(/<version>)/const(/<id>)(/<custom>)',
array('version' => 1),
array('custom' => 'x'),
'api/const/x',
),
array(
'(<controller>(/<action>(/<id>)(/<type>)))',
array('controller' => 'test', 'action' => 'index', 'type' => 'html'),
array('type' => 'json'),
'test/index/json',
),
array(
'(<controller>(/<action>(/<id>)(/<type>)))',
array('controller' => 'test', 'action' => 'index', 'type' => 'html'),
array('id' => 123),
'test/index/123',
),
array(
'(<controller>(/<action>(/<id>)(/<type>)))',
array('controller' => 'test', 'action' => 'index', 'type' => 'html'),
array('id' => 123, 'type' => 'html'),
'test/index/123',
),
array(
'(<controller>(/<action>(/<id>)(/<type>)))',
array('controller' => 'test', 'action' => 'index', 'type' => 'html'),
array('id' => 123, 'type' => 'json'),
'test/index/123/json',
),
);
}
/**
* When an optional param is specified, the optional params leading up to it
* must be in the URI.
*
* @dataProvider provider_optional_groups_containing_specified_params
*
* @ticket 4113
* @ticket 4630
*/
public function test_optional_groups_containing_specified_params($uri, $defaults, $params, $expected)
{
$route = new Route($uri, NULL);
$route->defaults($defaults);
$this->assertSame($expected, $route->uri($params));
}
/**
* Optional params should not be used if what is passed in is identical
* to the default.
@@ -556,6 +629,15 @@ class Kohana_RouteTest extends Unittest_TestCase
NULL,
array('action' => 'awesome-action'),
),
/**
* Optional params are required when they lead to a specified param
* refs #4113
*/
array(
'(<controller>(/<action>))',
NULL,
array('action' => 'awesome-action'),
),
);
}
@@ -573,18 +655,8 @@ class Kohana_RouteTest extends Unittest_TestCase
{
$route = new Route($uri, $regex);
try
{
$route->uri($uri_array);
$this->fail('Route::uri should throw exception if required param is not provided');
}
catch(Exception $e)
{
$this->assertInstanceOf('Kohana_Exception', $e);
// Check that the error in question is about the controller param
$this->assertContains('controller', $e->getMessage());
}
$this->setExpectedException('Kohana_Exception', 'controller');
$route->uri($uri_array);
}
/**