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