Commit graph

3532 commits

Author SHA1 Message Date
mark_story
3237402fb8 Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
ef3cb0e50c Adding tests for Set::normalize() 2010-11-20 22:46:55 -05:00
mark_story
6d9b000aee Changing how mergeVars are handled, so the difference of app/current is used as a base.
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
Juan Basso
3056fbf680 Changing authentication classes to use suffix Authentication instead of Method. 2010-11-20 17:47:35 -02:00
mark_story
e0a8ffe8a3 Applying patch from 'jmccaffrey' to fix issues on windows where virtual
machine paths would not be correctly handled.  Fixes #1254
2010-11-20 13:26:30 -05:00
mark_story
ba10003ef2 Fixing failing tests when HtmlHelper test was run by itself. 2010-11-16 22:52:49 -05:00
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
Juan Basso
7bea5d9410 Added the http directory to AllSocket tests. 2010-11-14 23:56:12 -02: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
Juan Basso
974161cf3a Changed the name of header to use in Digest method. 2010-11-13 21:47:25 -02:00
Juan Basso
85607a9963 Removed interference in the name of the headers. 2010-11-13 21:44:11 -02:00
Juan Basso
44629bd673 Support to digest method in HttpSocket. Thanks to jmcneese and Adrien Gibrat. 2010-11-13 20:51:09 -02: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
e63f81c12a Fixing test case that was missing request access. 2010-11-12 23:23:08 -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
Juan Basso
777afb6d3e separeted auth from HttpSocket. Refs #880 2010-11-09 23:09:56 -02:00
Juan Basso
2bed6622fe Added tests to thown in connect. 2010-11-09 21:00:57 -02: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
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
ADmad
81ce6f40b9 Added test cases showing usage of 'full_base' key for url generation. Refs #1256 2010-11-04 17:59:23 +05:30
mark_story
bff711e2dc Merge branch '2.0-console' into 2.0
Conflicts:
	cake/console/shells/acl.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
2010-11-02 23:49:19 -04:00
Juan Basso
b0a600f925 Merge branch '2.0-post-method' into 2.0 2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://" 2010-11-03 01:26:41 -02:00
mark_story
d1403b0da8 Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99.
Test cases updated.  Fixes #1253
2010-11-02 21:56:24 -04:00
Mark Story
94f9f7afeb Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest. 2010-10-31 22:42:16 -04:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35 Allowed the use of empty() and isset() in Controllers aliases properties. 2010-10-31 22:02:26 -02:00
Juan Basso
4eed660a62 Changed the form style to not affect layout. 2010-10-30 22:39:31 -02:00
Robert Sworder
593c45b6e7 Whitespace changes 2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6 dateTime functions + tests 2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987 meridian function 2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974 minute function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b hour function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc month function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c year function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2 __dateTimeSelected and day functions done, with tests 2010-10-29 23:43:48 -04:00
Robert Sworder
30f3494c98 Select function signature changed. Corresponding tests changed. 2010-10-29 23:43:48 -04:00
Robert Sworder
115c6102b9 Changes to make tests pass... 2010-10-29 23:43:48 -04:00
Mark Story
3ca0cdb1ee Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created.
Tests added.
2010-10-29 21:33:56 -04:00
mark_story
f29bb562cb Adding a test for saving blank fields on a model. Closes #1243. 2010-10-29 00:13:09 -04:00
mark_story
f5fd069583 Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
2010-10-27 23:03:31 -04:00
mark_story
d7847288e4 Adding Fennec as a built-in mobile browser.
Refactoring a test case to pull out the exceptional case.
Fixes #932
2010-10-27 22:32:15 -04:00
mark_story
3639f52117 Adding a test for containable modifying return. Refs #1219 2010-10-26 21:39:48 -04:00
SKAhack
9f2d33aa88 meta characters don't match on regex string
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-24 21:42:11 -04:00
mark_story
a57f8d3851 Adding another test for csrfUseOnce. 2010-10-24 20:57:12 -04:00
mark_story
22239b4481 Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
mark_story
4496a0a0bb Reformatting code to use tabs.
Fixing issue with float comparison.
Fixes #219
2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964 Updating to match ticket, using radians() SQL function. 2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19 Adding testcase for ticket #219 2010-10-24 19:38:23 -04:00
Graham Weldon
d3e0ddbb0e Update copyright years. 2010-10-25 07:58:22 +11:00
mark_story
54854c493b Changing output buffering, as ajaxtest was making output and breaking tests in group contexts. 2010-10-24 00:39:46 -04:00
mark_story
155bfe6293 Fixing failing test caused by setting an expiry value outside of the PECL extensions limits. 2010-10-24 00:05:27 -04:00
mark_story
0b2a6acc64 Merge branch '2.0' into 2.0-console 2010-10-23 19:19:04 -04:00
mark_story
bf7b8b0e93 Fixing issues with RssHelper and updating tests to reflect changes in how Xml::build() differs from previous versions' Xml. 2010-10-23 13:11:50 -04:00
mark_story
7aaf7e6b68 Fixing issue where Xml would not read CDATA blocks. 2010-10-23 11:01:13 -04:00
mark_story
a72d6da9c3 Making plugin schema tests less likely to stomp on tables they shouldn't be changing. 2010-10-23 00:54:39 -04:00
mark_story
7c296211ef Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice.
Moving tests around. Fixes #1180
2010-10-20 23:17:04 -04:00
mark_story
498417203b Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
mark_story
077d1c5ad5 Applying patch from 'hashmich' to fix issues with slideUp and slideDown effects in prototype engine.
Tests updated.
Fixes #1213
2010-10-20 22:07:53 -04:00
mark_story
1c25e627ad Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100.
Fixes #1205, Fixes #1204
2010-10-18 22:06:12 -04:00
Juan Basso
373fa780f7 Created the method FormHelper::postLink() to create a link with form to send data via POST. This feature require javascript. 2010-10-18 21:51:17 -02:00
Juan Basso
4c106490ef Created the method FormHelper::postButton() to create a button with form to send data via POST. 2010-10-18 17:53:27 -02:00
mark_story
84a8dbd85a Merge branch '2.0' into 2.0-console 2010-10-17 23:32:38 -04:00