Commit graph

4442 commits

Author SHA1 Message Date
mark_story
d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
f0ac462775 Updating test cases with failing tests. 2010-11-15 22:53:49 -05:00
mark_story
66e6ec763e Merge branch 'dispatcher-request' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/tests/cases/libs/all_routing.test.php
	cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
mark_story
27287e4b9f Moving AppTest into a separate file.
Updating test suite.
2010-11-14 13:06:25 -05:00
mark_story
f02e0483ee Reworking parameter munging specific to requestAction into requestAction. Updating tests cases for Object. As request->data is an array() not null. And leading / is trimmed off of [url][url]. 2010-11-14 01:01:11 -05:00
mark_story
55cc3296ab Making the Debugger tests pass when you have debug = 0 in your config file. Tests are runnable while debug = 0 from CLI. 2010-11-14 00:59:45 -05:00
mark_story
557d797297 Making Dispatcher test cases pass when Dispatcher expects a CakeRequest instead of a string. 2010-11-14 00:29:56 -05:00
mark_story
dad7963ea4 Moving Dispatcher inside libs directory, as it is part of CakePHP's libs. 2010-11-14 00:00:23 -05:00
mark_story
6073ac5dfa Fixing errors caused by accessing things that don't exist. 2010-11-13 23:57:01 -05:00
mark_story
9b08b725fe Merge branch '2.0' into 2.0-view
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
76a80c262e Fixing failing test caused by name() being able to quote things better now. 2010-11-13 12:04:22 -05:00
mark_story
6c8c7ca4a5 Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.
Tests updated.
2010-11-12 23:57:55 -05:00
mark_story
f9b7cbcb96 Making ConsoleOptionParser allow subclasses of the option, argument and subcommand classes to be supplied as arguments to the builder methods. Adding tests. 2010-11-12 23:52:33 -05:00
mark_story
e63f81c12a Fixing test case that was missing request access. 2010-11-12 23:23:08 -05:00
mark_story
faa23e8d51 Updating tests to reflect changes in bake templates. 2010-11-12 23:22:48 -05:00
mark_story
01894b315f Fixing issues caused by not accessing the request object correctly. 2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
mark_story
d044cdd02f Fixing test case that was missing request access. 2010-11-12 22:50:15 -05:00
mark_story
ec2884f17c Making routing suite include RedirectRoute. 2010-11-10 23:50:01 -05:00
mark_story
6c2b088706 Merge branch '2.0' into 2.0-view 2010-11-10 23:41:44 -05:00
mark_story
f4b0ec1d20 Updating E_STRICT issues in view test.
Removing dead methods and classes.
2010-11-10 23:40:56 -05:00
Mariano Iglesias
a1467822fb Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout 2010-11-10 23:03:38 -04:30
mark_story
b297bf633d Updating test to be correct. 2010-11-09 23:55:42 -05:00
mark_story
6c0dfe9592 Fixing error where params[url] has moved. 2010-11-09 23:44:33 -05:00
mark_story
1f5999f388 Adding some tests for element caching. 2010-11-09 22:31:05 -05:00
mark_story
1cf5e72054 Removing duplicated calls to slug()
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
mark_story
dfefc2d97b Very initial pass at getting elements cached with Cache. Refs #1268 2010-11-08 00:06:10 -05:00
mark_story
a9a9bc0e2e Removing bogus crud in the test. 2010-11-07 23:48:14 -05:00
mark_story
e431e86aa4 Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added. 2010-11-07 20:53:04 -05:00
Jeremy Harris
c98306727d Merge branch '2.0-redirect' into 2.0 2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511 Added support for redirection routes. Fixes #1151 2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84 Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086 2010-11-07 17:08:01 -08:00
Jeremy Harris
b5deb41fb7 Merge remote branch 'upstream/2.0' into 2.0 2010-11-07 15:48:50 -08:00
Jeremy Harris
cad6fc7a17 Force console output tests to output as color 2010-11-07 15:41:40 -08:00
mark_story
5214c56f1b More instructions on how to install phpunit. 2010-11-07 18:02:19 -05:00
mark_story
b8cc605e21 Updating instructions for installing phpunit. 2010-11-07 18:00:22 -05:00
mark_story
3216c902cd Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
22497eb41c Fixing failing tests in controller test. 2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8 Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated. 2010-11-07 13:23:45 -05:00
mark_story
1ba28c246b Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter.
Tests updated.
2010-11-07 13:23:45 -05:00
mark_story
4c0fd76a2e Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation. 2010-11-07 13:23:45 -05:00
mark_story
4739d7f955 Adding tests for CacheHelper callback methods. 2010-11-07 13:23:45 -05:00
mark_story
f7f9c3f6a2 Removing a test case that doesn't need to exist anymore as the conditions for cache generation are now in CacheHelper. 2010-11-07 13:23:44 -05:00
mark_story
2e140a9fd3 Adding tests for element callbacks. 2010-11-07 13:23:43 -05:00
mark_story
1b19ad48b4 Adding parameters to helper callbacks, these allow helpers to introspect more on the view/layout being rendered.
Updating tests.
2010-11-07 13:23:42 -05:00
mark_story
76919902b9 Removing direct tests of protected method.
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149 Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks.
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
2010-11-07 13:23:42 -05:00
mark_story
1424e02488 Adding a method to CakeRequest to parse out the accept-language header. This will help remove features from l10n. 2010-11-07 01:35:36 -04:00
ADmad
eb76ab95f2 Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself. 2010-11-06 09:33:50 +05:30
mark_story
d56b812181 Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added.
Fixes #1257
2010-11-04 21:08:40 -04:00