Commit graph

210 commits

Author SHA1 Message Date
mark_story
de0b90db4a Moving addition of plugin and controller keys to Router instead of RouterRoute. 2009-11-29 16:21:33 -05:00
mark_story
9e9559b350 Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults. 2009-11-29 16:09:45 -05:00
mark_story
b242dc9531 Moving parameter persist to RouterRoute.
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling. 2009-11-29 09:49:19 -05:00
mark_story
889e367510 Expanding and correcting doc block for router::connect. 2009-11-28 23:37:40 -05:00
mark_story
5b4d15dc3b Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on. 2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47 More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together. 2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters. 2009-11-27 17:12:35 -05:00
mark_story
49c6cd3f9f Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition. 2009-11-27 09:58:51 -05:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
feb0dec970 Starting tests for RouterRouter::parse() 2009-11-26 23:01:54 -05:00
mark_story
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
mark_story
c4ceeabcf5 More tests and more passing tests for Route compilation.
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
mark_story
0b9ae92eb9 Adding a test case for RouterRoute to increase code coverage. 2009-11-25 23:51:27 -05:00
mark_story
1d7881b16f Renaming connectDefaults to defaults().
Updating tests.
2009-11-25 23:39:07 -05:00
mark_story
52264cb61c Fixing persistent param route exiting.
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3 Merge branch '1.3-misc' into 1.3-router
Conflicts:
	cake/libs/router.php
2009-11-25 22:57:42 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
88ef00d2d0 Removing trailing whitespace. 2009-11-04 23:05:25 -05:00
mark_story
f61291c1c3 Renaming setup() to startTest. 2009-11-04 23:03:09 -05:00
mark_story
4cb88ab1bb Expanding tests for RouterRoute route compilation. 2009-11-04 23:03:08 -05:00
mark_story
4a81017f9d Splitting very large test method into smaller pieces. 2009-11-04 23:03:08 -05:00
mark_story
aeb61f3750 Continuing to refactor Router methods into RouterRoute.
Fixed issues with some routes having trailing / and others not.
All existing router tests are passing.
2009-11-04 23:03:08 -05:00
mark_story
cc5c5a5ac9 RouterRoute now being used instead or route arrays.
Still some failing tests, mostly due to trailing /
2009-11-04 23:03:08 -05:00
mark_story
6da1ab9c30 Moving matching and parsing methods into RouterRoute. 2009-11-04 23:03:08 -05:00
mark_story
fec83abd90 Starting refactoring of Route methods into a separate class. Tests added. 2009-11-04 23:03:08 -05:00
mark_story
ed2e20ed23 Merge branch '1.3-misc' into 1.3 2009-10-02 13:18:12 -04:00
mark_story
cba8871f16 Adding tests so that adding one prefix removes other prefixes. Making it so you can only have one prefix at a time in a route. Also simplifies prefix switching. 2009-09-30 10:19:43 -04:00
mark_story
17782f71b3 Removing internal magic 'id' param. It behaved inconsistently in that it defaulted into the passed parameters, even though it was input as a named/routed parameter. This change makes 'id' a regular routed/named parameter. 2009-09-29 22:53:17 -04:00
mark_story
dfae21be8b Expanding test coverage of newly added Routing.prefixes.
Flagging legacy support test cases.
2009-09-27 01:22:46 -04:00
mark_story
76c1c1cb8e Implementing Routing.prefixes.
Replaces Routing.admin and streamlines the use of Routing prefixes so they behave more consistently with admin routing.
2009-09-27 00:12:03 -04:00
mark_story
3e394f1fa8 Adding test cases for Routing.prefixes. 2009-09-26 22:48:57 -04:00
mark_story
3904c6f7b5 Adding constructor to Router.
Adding __setPrefixes to initialize prefixes and merge Routing.admin with new Routing.prefixes.
2009-09-26 22:37:19 -04:00
mark_story
cf849e3cf8 Removing svn tags. 2009-09-26 22:22:43 -04:00
mark_story
89bf3440da Fixing failing test. 2009-09-20 19:02:05 -04:00
mark_story
3c21fa32ba Changing syntax to reflect updated api's 2009-09-20 18:38:26 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
Ali Farhadi
12457ac6f9 Adding testcase for bug #44 2009-09-05 00:53:06 -04:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
DarkAngelBGE
9da7b6ef55 Bringing Router coverage up to 94.45%, minor router refactorings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8258 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 09:49:27 +00:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
DarkAngelBGE
d6a12ce5f1 2nd param init value for Router::stripPlugin(), improving router's coverage by adding tests for stripPlugin()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8245 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 13:02:31 +00:00
mark_story
d2245fd514 Fixing Router::normalize() so that a url containing the base param more than once, which is passed into normalize() multiple times does not get url segments removed. Fixes #6338 and #5978
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8236 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-20 13:18:38 +00:00
mark_story
74fd4849ba Fixing issue in Router where generating plugin shortcut controller routes with admin prefixes left a :controller param behind. Fixes #6252
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8235 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 21:35:23 +00:00
nate
8369a8f2d8 Sanitizing path in Dispatcher::baseUrl(), fixes #6336, misc. whitespace fixes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8165 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:36:22 +00:00
mark_story
6e91ee7ad4 Adding tests to disprove #6306
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8148 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-20 07:36:26 +00:00
davidpersson
3c3b852099 Changing package of tests from "cake.tests" to "cake".
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
gwoo
9217a85281 adding router test and patch for plugin reverse routing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8041 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-17 18:26:37 +00:00
renan.saddam
de5cb3cabf Adding tests to Router::url in order to test url generation with mapResources(). Closes #5951.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7998 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 01:17:09 +00:00
mark_story
7c87d36d74 Updating Router::queryString() and Router::url() to allow additional parameters to force escaping of & used in query strings. Tests added. Refs #5982
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7987 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 21:38:11 +00:00
gwoo
6026e75009 fixing preg error in Router::normalize cause by last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7984 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 18:27:14 +00:00
gwoo
52318f9d17 fixes #5978, Router::normalize url generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7981 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 17:55:48 +00:00
renan.saddam
111b886570 Removed trailing whitespaces from tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7848 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:58:37 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
9c734f32a2 Adding test to disprove #5521
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7699 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-04 18:01:48 +00:00
phpnut
cb487bd6e6 More optimization refactoring.
Fix cache but causing  object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
nate
7b8e69f120 Added config value caching and just-in-time compiling to Router
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7536 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-29 18:17:14 +00:00
mark_story
4db90553ec Router::parse will now pass ids of '0'. Test Added. Closes #5299
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7484 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-22 03:27:07 +00:00
gwoo
074ede4639 adding additional case for Router::normalize() and Controller::referer() to show #5157 is invalid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7463 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-13 18:07:52 +00:00
nate
4451c02b1c Corrects handling of fully-qualified URLs in Router::normalize(), fixes #4036
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7363 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-25 11:45:00 +00:00
mark_story
0b23ec64ff Modified all remaining tests to use CakeTestCase. Switched all uses() calls to App::import().
Added tests to configure.test to test importing from plugins.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7348 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-21 02:40:58 +00:00
mark_story
c1bac3358a Adding additional tests related to prefix routing. Shows usage in paginator. Refs #5115
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7346 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-19 17:20:42 +00:00
nate
0cd5b435d9 Adding Router tests to verify URL generation with flags and prefixes both in and out of context
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7331 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-09 14:28:32 +00:00
phpnut
ed0a031ec4 Adding correct test cases for #5046 showing proper prefix usage, closes #5046 as invalid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7323 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 14:48:09 +00:00
mark_story
4b1de6ac0e Added test for setting extension with Router::connect()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7298 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-29 20:24:06 +00:00
gwoo
c004dd68a5 removing empty lines from the end of test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7295 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 08:17:02 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
82f4a03385 fixes #4923, argSeparator in Router::connectNamed()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7206 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-17 15:46:49 +00:00
gwoo
2d3480a9ae closes #4917, adding test cases to show that 0 is properly handled in conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7187 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:26:01 +00:00
gwoo
df2be46b00 fixes #4874, duplicate base when url is empty
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7186 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:12:56 +00:00
AD7six
a978fb2661 adding Doc blocks to everything in tests folder missed in the first pass.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7126 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-05 15:20:45 +00:00
AD7six
f44c755475 Adding doc blocks to everything in the tests dir
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7094 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 19:22:55 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
gwoo
f65f2fd3bc fixes #3415, notices in router
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6988 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 15:00:00 +00:00
the_undefined
521986b27f Fixed problem with boolean values passed into connectNamed
Added documentation


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6934 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 23:08:49 +00:00
the_undefined
847811701c Fixed Router::connectNamed, added enhanced named parameter control, closes #4451
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6933 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 22:52:28 +00:00
the_undefined
170fe3d9d1 Fixed Router::queryString php.ini setting dependency, closes #4614
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6831 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 03:40:24 +00:00
DarkAngelBGE
5cb193db6e putting RouterTest::testFullBaseURL() back into place for CLI test reporting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6762 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 15:11:18 +00:00
DarkAngelBGE
25033f1599 removing two Router::url() relevant test cases for cli test reporting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6757 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 14:35:39 +00:00
nate
f96379ea36 Refactoring Router test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6754 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 14:19:19 +00:00
nate
b9cfc9ecf3 Correcting handling of empty URLs with full base, fixes #4470
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6750 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-04 04:34:29 +00:00
gwoo
2c061ede2b updating router test case, closes #4553 where FULL_BASE_URL is not defined when test is run from console
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6739 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-01 04:54:55 +00:00
joelmoss
f9ea98e746 Changed Router tests to use static method calls to reflect actual usage in applications. Fixed the __resourceMapped call in Router::mapResources and added tests to prove it is assigned correctly. Fixes #4530
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6716 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-24 13:41:11 +00:00
the_undefined
ee94d5662c Added persist feature to routing, allows namedArgs to be auto-populated for reverse routing based on current request
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6704 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-19 20:57:23 +00:00
the_undefined
e46425f759 Fixed bad test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6696 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 11:25:03 +00:00
nate
8756f0d471 Adding test case for generating full-base absolute URLs, disproves and closes #4470
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6694 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 06:58:14 +00:00
the_undefined
5c0b72db85 Added support for controlling namedArg behavior on routes level, fixes #4451
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6686 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-17 23:14:49 +00:00
the_undefined
4b19d4c38d Added support for final characters in multi param route elements
Fixed issue with reverse routing and falsely escaped route regex

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6647 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-09 18:26:20 +00:00
mariano.iglesias
4b25239298 Adding router test case for URL generation with prefixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6635 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-05 14:21:33 +00:00
the_undefined
7a769f68ca Restricted named route element to contain no special chars other then '_'
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6559 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-11 15:19:46 +00:00
nate
24ea731e7f Making parsed parameters always show up at the beginning of 'pass', closes #4299
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6517 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-08 16:14:51 +00:00
mariano.iglesias
33c0fec53a Resetting route prior to test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6510 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-06 22:30:38 +00:00
mariano.iglesias
c689a95a43 Adding more tests for router regarding paging routes and named parameters
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6509 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-06 21:47:54 +00:00
nate
12466ebe43 Making sure default extension is always set when Router::parseExtensions() is used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6507 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-03 23:56:18 +00:00
the_undefined
0b4e8e63ac Added support for multiple route parameters per path element
Fixed bug with pass param order
Added / updated router tests

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6498 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-01 15:57:25 +00:00