Commit graph

3979 commits

Author SHA1 Message Date
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
687eab9528 Adding a toggle all button to the coverage report. Makes it easier to see the test subject at a glance.
Adding ability to only show files that match the extension-less basename of the test case file.  This hides much of the noise the new reports have.
2010-05-09 23:20:28 -04:00
Mark Story
e8e2235cfa Updating coverage report and tests to include hiding javascript. 2010-05-09 22:15:20 -04:00
José Lorenzo Rodríguez
1e01e21bf9 Impriving the default for expectExpection 2010-05-09 18:48:39 -04:30
José Lorenzo Rodríguez
bc9479efcf Fixing XmlTest to be compatible with PHPUnit 2010-05-09 18:18:40 -04:30
José Lorenzo Rodríguez
508d707a7a Adding another compatibility test method: assertWithinMargin 2010-05-09 18:16:42 -04:30
José Lorenzo Rodríguez
88d21fbea4 Experimental change: restoring the error handler to steps back in the stack to let PHPUnit take over when running tests 2010-05-09 18:15:51 -04:30
José Lorenzo Rodríguez
809550087c Finxing ThemeTest to be compatible with PHPUnit 2010-05-09 16:27:09 -04:30
José Lorenzo Rodríguez
c96b14541d Adding new compatibility method for CakeTestCase 2010-05-09 16:09:57 -04:30
José Lorenzo Rodríguez
d252fdeb52 Fixing View test case to be compatible with PHPUnit 2010-05-09 16:09:02 -04:30
Mark Story
f084a82dfc Refactoring how coverage diffs are generated to better use data from phpunit. Removing methods made redundant by data changes. 2010-05-09 12:30:55 -04:00
Mark Story
ac318faf5a Switching back to using non raw code coverage data as it has been filtered by phpunit's filters. combining the data from phpunit into a singular cohesive report. 2010-05-09 02:08:32 -04:00
Mark Story
3c3655aefd Fixing failing tests. 2010-05-09 01:16:44 -04:00
Mark Story
75d7146bd0 Updating code coverage tools to use raw data which includes dead and uncovered line data. 2010-05-09 01:15:57 -04:00
Mark Story
9a20a2344b Continuing work on updated code coverage reports. 2010-05-09 00:40:05 -04:00
Mark Story
955c6bea9f Verbose coverage generation has been added and tests added. 2010-05-09 00:04:03 -04:00
José Lorenzo Rodríguez
b8e83e6a49 Adding documentation for CakeFixtureManager 2010-05-08 17:50:55 -04:30
Mark Story
f6b49cd865 Updating file headers. 2010-05-08 18:12:20 -04:00
Mark Story
ccf5601a69 Updating coverage report initialization. 2010-05-08 18:12:03 -04:00
Mark Story
fad99ad1f4 Adding tests for merging of report data. 2010-05-08 18:08:02 -04:00
José Lorenzo Rodríguez
f5cfc325f8 Adding some missing doc blocks 2010-05-08 17:29:33 -04:30
Mark Story
ac5f731940 Starting work on HtmlCoverageReport and adding a test case. 2010-05-08 17:59:14 -04:00
José Lorenzo Rodríguez
79c001197d Merge commit 'mark/2.0-phpunit' into 2.0-phpunit
Conflicts:
	cake/tests/lib/test_manager.php
2010-05-08 17:18:43 -04:30
José Lorenzo Rodríguez
72f162f52a Adding docs to CakeTestSuite 2010-05-08 16:52:29 -04:30
Mark Story
fd073809d0 Removing references to non phpunit code coverage parsing.
Adding stub of new code coverage report generator.
Updating related files.
2010-05-08 17:14:47 -04:00
José Lorenzo Rodríguez
fb09adca68 Adding tests for skipIf 2010-05-08 16:36:11 -04:30
José Lorenzo Rodríguez
4d3a6e8ca6 Fixing and testing for CakeTestCase::loadFixtures() 2010-05-08 16:14:22 -04:30
José Lorenzo Rodríguez
2b5cd26fc6 Adding tests for CakeTestCase fixtures 2010-05-08 15:56:21 -04:30
José Lorenzo Rodríguez
5d041c58b7 Using the CakeTesSuite in TestManager and calling accordingly the load and unload of fixtures using the variable
$sharedFixture
2010-05-08 15:55:16 -04:30
José Lorenzo Rodríguez
ec9c8b4d49 Adding the new class CakeTestSuite to setup some utility stuff like fixtures outside of CakeTestCase 2010-05-08 15:53:29 -04:30
José Lorenzo Rodríguez
acb9733d0e Convertint CakeFixtureManager into a non-static class to be able to replace it with custom implementations
and to test it more easily
2010-05-08 15:52:11 -04:30
Mark Story
507c3b2d94 Adding the CakePHP testing classes to the coverage ignore filter for PHPUnit. Starting to refactor how coverage is generated, to use more features of PHPUnit. 2010-05-08 16:18:45 -04:00
Mark Story
933378223b Updating CakeLog tests to use @expectedException annotation. 2010-05-08 16:17:20 -04:00
Mark Story
e7ff0bdf66 Adding missing parameters to assertEqual() wrapper.
Adding assertNotEqual() wrapper.
Adding expectError() but it doesn't work because of Debugger's error handler being set.
Fixing fatal error where getDescription would not be defined.
2010-05-08 11:42:04 -04:00
José Lorenzo Rodríguez
82a1bd6f80 Cleaning up CakeTestCase and adding some tests for it 2010-05-08 01:19:45 -04:30
Mark Story
5040eb7227 Updating RequestHandler and its tests to use the features moved to CakeRequest. Marking a number of methods as deprecated. 2010-05-08 00:59:40 -04:00
Mark Story
78bd7300a2 Moving features from RequestHandler into CakeRequest. 2010-05-08 00:36:03 -04:00
Mark Story
df910026ee Updating Controller::referer() to use the request object if available. Tests updated. 2010-05-08 00:06:13 -04:00
Mark Story
77264da34a Updating Controller tests to always pass in a CakeRequest. Fixing some notice errors that come up in the test cases. 2010-05-08 00:00:19 -04:00
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
745afe888b Adding more tests for saving records with nulls. Closes #675 2010-05-07 22:23:18 -04:00
José Lorenzo Rodríguez
e81cc684ef Merge branch '2.0-phpunit' of git@github.com:lorenzo/cakephp1x into 2.0-phpunit
Conflicts:
	cake/tests/lib/cake_test_case.php
2010-05-07 19:48:50 -04:30
José Lorenzo Rodríguez
7124e6db3e Refactoring CakeTestCase to remove fixture specific code and use the new class CakeFixtureManager.
It lacks support to auto-drop tables after test case end, but it is already usable for testing
2010-05-07 18:07:02 -04:30
José Lorenzo Rodríguez
ef142b1659 Adding the class CakeFixtureManager to delegate the task of creating and droping the fixtures
Tests and docs still pending
2010-05-07 18:06:17 -04:30
Mark Story
26f7fcef3c Updating Controller and its tests to use CakeRequest. 2010-05-06 23:23:13 -04:00
Mark Story
2b7723fd12 Removing reference operators and making Controller::__construct take a CakeRequest. If one is passed all the necessary properties will be populated. This lightens the Dispatcher, and gives more control to the end developer. 2010-05-06 23:18:50 -04:00
Mark Story
1a460e47f1 Removing reference operators in Controller and its tests. 2010-05-06 22:48:48 -04:00
Mark Story
f152181c03 Adding tests for saving models with id == null. Closes #675 2010-05-06 22:24:11 -04:00
Mark Story
45d052b55a Fixing failing tests in ViewTask test case, caused by changes in core templates.
Fixing incorrect variable usage where models would be double singularized causing incorrect names.  Fixes #668
2010-05-06 21:38:14 -04:00
José Lorenzo Rodríguez
bed87b87c6 Removing code from CakeTestCase around the method "testAction" which was a bad way of testing controllers, often making it more difficult.
This also removes class contamination in newly created test cases
2010-05-05 22:42:56 -04:30
José Lorenzo Rodríguez
b53d21ff52 Fixing a group test case to show how to create one, and to make pass TestManager test case 2010-05-04 23:58:17 -04:30
José Lorenzo Rodríguez
fd4a82d6e9 Adding test for TestManager::runGroupTest() 2010-05-04 23:56:40 -04:30
José Lorenzo Rodríguez
856a52a378 Changing runGrouptTest to find for conventional class names. This commit removes the support for loading more than one groupt test class per file 2010-05-04 23:13:07 -04:30
Mark Story
fcad9b464c Fixing tests broken by changes in default bake templates.
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-04 23:27:41 -04:00
Mark Story
62157679c4 Fixing failing test in Dispatcher caused by removed method. 2010-05-04 23:08:03 -04:00
Mark Story
b9a00ccfa5 Updating test case to use new Router constants. 2010-05-04 23:05:45 -04:00
José Lorenzo Rodríguez
41683723f7 Making more methods static in TestManager 2010-05-04 21:04:18 -04:30
José Lorenzo Rodríguez
c23f66e35c Removing "extends" from TestManager as it wasn't used anyway.
Making some methods static as they were called statically
More testing on TestManager
2010-05-04 20:51:58 -04:30
José Lorenzo Rodríguez
cdf4006f16 Refactoring TestManager::runAllTests() and improving the TestManager test case 2010-05-04 18:25:15 -04:30
José Lorenzo Rodríguez
4a152d3d55 Adding number of assertion runned in html reporter
enabling "show passes" (that in contrast of simpletest only reports the passed test method instead of the assertion)
cleaning up a bit
2010-05-04 16:31:03 -04:30
José Lorenzo Rodríguez
10434c35b6 Improving PHPUnit path detection when it is installed via pear 2010-05-04 16:30:06 -04:30
José Lorenzo Rodríguez
9afbeaa217 Converting CakeHtmlReporter in a TestCase listener.
this apparently shows that it is easy to make the transition to PHPUnit.
2010-05-04 13:51:25 -04:30
José Lorenzo Rodríguez
ce7f892d6a Removing simpletest dependency in CakeBaseReporter 2010-05-04 13:50:07 -04:30
José Lorenzo Rodríguez
15dd798e30 Some experimental movements inside TEstManager to make it work with PHPUnit 2010-05-04 13:49:10 -04:30
José Lorenzo Rodríguez
14559aabd9 Adding compatibility assert methods for CakeTestCase to ease the transition to PHPUnit 2010-05-04 13:47:08 -04:30
José Lorenzo Rodríguez
7417a00de7 Initial step to replace simpletest for PHPUnit
This is probably temporary, still needed to see if PHPUnit is already in path (installed with pear or something)
2010-05-04 13:40:50 -04:30
Mark Story
e9a7d6d3b9 Splitting CakeRoute and PluginShortRoute into their own files. Also splitting out the test cases. 2010-05-04 00:35:22 -04:00
Mark Story
f76d320688 Making Router a fully static class. Tests updated. 2010-05-04 00:26:02 -04:00
Mark Story
c91d74a9af Making CakeRequest toss an exception when it can't handle a method call. 2010-05-03 23:41:13 -04:00
Mark Story
c5fdeec7a1 Updating FormHelper tests to use CakeRequest. 2010-05-03 23:39:43 -04:00
Mark Story
69275c8996 Adding a parameter to CakeRequest to allow it to skip parsing the environment. 2010-05-03 22:50:38 -04:00
Mark Story
ce10c85367 Making Sanitize::stripScripts() to remove multi-line script and style blocks. Fixes #657 2010-05-03 22:33:20 -04:00
Mark Story
95dbae8acf Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 2010-05-03 22:07:13 -04:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
d94ff92a9d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/lib/reporter/cake_html_reporter.php
2010-05-02 18:03:23 -04:00
Mark Story
dc08aedb44 Fixing constructors for reporter classes. 2010-05-02 17:54:49 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
b5a0dccc3a Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-05-02 17:03:20 -04:00
Mark Story
4a0ead8a62 Fixing asset filtering for assets in themes and plugins. These assets should now correctly enter the configured asset filters. Fixes #650. Fixes #160 2010-05-02 16:48:35 -04:00
Mark Story
e11f7da896 Adding support for Router::reverse() to operate on CakeRequest objects. 2010-05-02 02:19:32 -04:00
Mark Story
7e25d94258 Renaming internals of Router.
Adding tests for legacy setRequestInfo() support.
2010-05-02 02:16:16 -04:00
Mark Story
26279851e1 Making Router::setRequestInfo() able to accept arrays. It will convert older style arrays into a CakeRequest object for later use.
Updating uses of Router::setRequestInfo() to just pass the object where possible.
2010-05-02 01:59:56 -04:00
Mark Story
e336df6de8 Updating some uses of Router::setRequestInfo(). 2010-05-02 01:43:37 -04:00
Mark Story
982437595e Fixing errors caused by API changes. 2010-05-02 01:22:59 -04:00
Mark Story
4eef2c19f0 Making CakeRequest::addParams() chainable. Adding CakeRequest::addPaths() to allow easy settings of path variables, its also chainable. Tests added. 2010-05-02 01:22:34 -04:00
Mark Story
12cbf3198a Removing addslashes/stripslashes in cache file generation as they were creating corrupted serialized objects. Replacing with a simple str_replace() on ' instead. 2010-05-02 00:12:53 -04:00
Mark Story
13cc8e746d Moving tests into CakeRequest from dispatcher test.
Dispatcher tests are all working again.
2010-05-01 23:49:22 -04:00
Mark Story
e4cf8a6937 Fixing issue where 'data' could not be accessed with array access, there were tests in Dispatchers tests that expected this. 2010-05-01 23:46:10 -04:00
Mark Story
d2ea077b81 Moving parameter parsing below asset dispatching, should speed up asset dispatching.
Updating + fixing tests to reflect API changes and fixing some issues where router was breaking assets.
2010-05-01 23:19:47 -04:00
Mark Story
aa234bc861 Making CakeRequest keep [url][url] for compatibility issues. 2010-05-01 22:45:31 -04:00
ADmad
f386dca6d8 Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case. 2010-05-02 05:34:38 +05:30
Mark Story
0eb4849803 Renaming a method. 2010-05-01 11:08:58 -04:00
Mark Story
2b08ad6012 Updating fatal tests in Dispatcher tests. Updating Router to use a method instead of a raw array_merge. 2010-05-01 11:07:32 -04:00
Mark Story
0a7ba707b6 Adding tests for CakeRequest::addParams() 2010-05-01 11:06:51 -04:00
Mark Story
40bca71985 Adding tests and features for CakeRequest to parse querystring args from the url parameter in the constructor. Added tests. 2010-05-01 11:04:41 -04:00
Mark Story
fbd70bf23c Making Dispatcher::parseParams require a CakeRequest object instead of as string url. Updating tests in the Dispatcher, and fixing an issue where POST params would be wiped out by Router. 2010-05-01 10:48:30 -04:00
Mark Story
ffd05ffc3e Removing methods from Dispatcher that have been moved to CakeRequest.
Removing test cases for features that don't exist anymore.
Updating Router and Dispatcher to use the request object.
2010-05-01 01:43:06 -04:00
Mark Story
558aea0221 Moving tests and helper methods from Dispatcher into CakeRequest 2010-05-01 01:06:09 -04:00
Mark Story
4deacf0b06 Existing tests are now all passing. 2010-05-01 00:18:17 -04:00
Mark Story
c7f4334bff Moving test code around and starting to refactor things in tests. 2010-04-30 23:37:16 -04:00
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true
Closes #654
2010-04-30 16:42:59 -04:30
José Lorenzo Rodríguez
9b040a5ed3 Fixing code formating 2010-04-30 16:07:59 -04:30
ADmad
0471ea046f Adding test case for 'required' class adding to wrapping div based on model validations. Refs #654 2010-05-01 01:19:52 +05:30
Mark Story
85b86164e3 Starting to move additional methods from Dispatcher into CakeRequest. Tests have been moved, and updated. 2010-04-30 00:13:24 -04:00
Mark Story
51db3c80ef Moving query string params around. Updating test cases. 2010-04-29 23:20:31 -04:00
Mark Story
0bbd7fae2c Adding more tests to CakeRequest::addDetector() for callback type. 2010-04-29 23:11:15 -04:00
Mark Story
6dcc680c1a implementing CakeRequest::addDetector() and adding test cases. 2010-04-29 23:08:01 -04:00
Mark Story
4fbed678cf Fixing bad method call again. 2010-04-29 22:34:01 -04:00
Mark Story
a6ee9e352d Expanding doc blocks for methods.
Adding ArrayAccess implementation and test cases.
2010-04-29 00:22:33 -04:00
Mark Story
476a76b7a4 Adding __get() and test cases. 2010-04-29 00:22:33 -04:00
Mark Story
c11095bc54 Adding __call() for undefined method handling. Tests added. 2010-04-29 00:22:33 -04:00
Mark Story
3a0ad6f1a8 Starting CakeRequest::is() and adding tests for various core is() types. 2010-04-29 00:22:32 -04:00
Mark Story
aab4a9413a Adding CakeRequest::referer() and test cases. 2010-04-29 00:22:32 -04:00
Mark Story
64aafd36bb Expanding coverage for CakeRequest. Expanding doc blocks in CakeRequest. 2010-04-29 00:22:32 -04:00
Mark Story
93f4c66035 Adding tests for CakeRequest's ability to munge through the FILES array. Fixing issue where files would be in the wrong place. 2010-04-29 00:22:32 -04:00
Mark Story
8f207a5f69 Moving getClientIp into CakeRequest. Moving relevant tests as well. 2010-04-29 00:22:32 -04:00
Mark Story
15a4607061 Fixing some issues with parameter handling. Adding test cases. 2010-04-29 00:22:32 -04:00
Mark Story
f17eebecf2 Adding CakeRequest and its test case. Moving features from Dispatcher into CakeRequest. 2010-04-29 00:22:32 -04:00
Mark Story
7ea8640b76 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-29 00:22:30 -04:00
ADmad
4efb07b15a Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-29 00:20:35 -04:00
Mark Story
a691edbcff Adding tests for passed arguments with dots when parseExtensions() has been called. Refs #620 2010-04-29 00:20:35 -04:00
Mark Story
e725ae10fa Adding tests for dispatcher to show periods not being removed. Refs #620 2010-04-29 00:20:35 -04:00
Mark Story
0800483407 Adding tests that show that Router is not chopping off periods from passed arguments. Refs #620 2010-04-29 00:20:35 -04:00
Mark Story
70b3225ff0 Fixing group path checking in test manager.
Conflicts:

	cake/tests/lib/test_manager.php
2010-04-29 00:20:35 -04:00
Mark Story
57648c5492 Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-29 00:20:35 -04:00
Mark Story
e4ea82dfc9 Adding htmlentities() to all parameters passed into the HtmlReporter. 2010-04-29 00:20:35 -04:00
Mark Story
a08c09ab17 Fixing security vulnerabilities in the test suite runner. 2010-04-29 00:20:35 -04:00
Mark Story
33a38118b6 Making tests more accurate to normal use, removing extra params and adding some tests for sortKey. Refs #614 2010-04-29 00:20:35 -04:00
Mark Story
328c58635b Fixing inflection of words ending in analysis. Fixes #619 2010-04-27 23:03:37 -04:00
ADmad
c2bd87144e Adding test case for HtmlHelper::url() showing use of key 'full_base' for parameter. Refs #627 2010-04-27 00:19:01 +05:30
predominant
9243f6601a Merge remote branch 'markstory/2.0' into 2.0 2010-04-26 14:11:07 +10:00
predominant
d5073d7bcf Fixed failing Set tests from Model class visibility. 2010-04-26 12:53:02 +10:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
Mark Story
46b9e76d8e Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-24 17:34:45 -07:00
Mark Story
ce260debbc Adding tests for passed arguments with dots when parseExtensions() has been called. Refs #620 2010-04-24 17:30:00 -07:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
Mark Story
3e85577c1f Adding tests for dispatcher to show periods not being removed. Refs #620 2010-04-24 10:42:19 -07:00
Mark Story
5f03862f25 Adding tests that show that Router is not chopping off periods from passed arguments. Refs #620 2010-04-24 10:40:15 -07:00
Mark Story
9ddbd6f686 Removing dependancy on Object from CakeSocket. Making tests less dependant on having a network connection. 2010-04-23 21:41:20 -07:00
Mark Story
e8b6d45850 Fixing fatal errors in HttpSocket test case. 2010-04-24 00:31:10 -04:00
Mark Story
a17a38ddf4 Fixing fatal errors in View test.
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -04:00
Mark Story
35ec5ce2fc Updating test method names and moving parameter modification around. 2010-04-23 23:59:57 -04:00
Mark Story
e111735905 Changing AclBase into AclInterface as it is now an interface.
Splitting the test case into separate test cases for each class.
2010-04-23 23:52:36 -04:00
Mark Story
523eda018e Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit. 2010-04-23 23:14:55 -04:00
Mark Story
62982c57b4 Making AclComponent throw exceptions when it encounters an error.
Making AclBase an abstract class.
Adding AclComponent::adapter() for runtime modification of the Acl implementation.
Tests added, updated and fixed.
2010-04-23 23:03:51 -04:00
Mark Story
33a2907202 Adding CakeLogInterface and implementing it in core and test suite classes. The new interface is used for method detection instead of a hard method check. Making CakeLog throw exceptions instead of trigger errors when things go wrong. 2010-04-23 22:31:21 -04:00
Mark Story
4d4d9e78f8 Adding App::setObjects() as a temporary way to modify App's cache of plugins. This allows the DispatcherTest to successfully run. 2010-04-23 22:04:16 -04:00
Mark Story
0a8aafe3c8 Fixing reference to method name. 2010-04-23 22:03:11 -04:00
Mark Story
d926a379b4 Removing params() it was a pretty much useless function, and was deprecated. 2010-04-23 21:32:23 -04:00
Mark Story
84002687c8 Making Security a static class.
Fixing static access issues in test case.
2010-04-23 21:28:54 -04:00
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
2010-04-23 21:21:31 -04:00
Mark Story
9e08196c76 More tests for ajax link delegation. 2010-04-23 21:14:23 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
Mark Story
999eb4be7b Fixing illegal access in HtmlHelper tests, replacing with mock object. 2010-04-23 20:51:24 -04:00
Mark Story
8cce38692a Simplifying route configuration failure test case. 2010-04-23 20:42:53 -04:00
Mark Story
0fc106428a Adding exception tossing for invalid cacheengine configuration. 2010-04-23 20:41:29 -04:00
Mark Story
6f0b43f156 Fixing fatal error in Cache stub classes. 2010-04-23 20:31:08 -04:00
Mark Story
797fa0009a Making Router throw exceptions when invalid route classes are used for routes. 2010-04-23 20:22:02 -04:00
Mark Story
56967e71c1 Fixing group path checking in test manager.
Conflicts:

	cake/tests/lib/test_manager.php
2010-04-23 00:46:13 -04:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
Mark Story
c404ae5400 Adding htmlentities() to all parameters passed into the HtmlReporter. 2010-04-22 23:36:20 -04:00
Mark Story
813a3af19c Fixing security vulnerabilities in the test suite runner. 2010-04-22 23:36:02 -04:00
predominant
f51ce734bf Import Validation from old 2.0 branch. 2010-04-23 12:53:47 +10:00
Mark Story
215333e56f Making tests more accurate to normal use, removing extra params and adding some tests for sortKey. Refs #614 2010-04-22 22:53:36 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
a92b9000bf Adding tests for non .com domains. Refs #605 2010-04-22 21:37:27 -04:00
José Lorenzo Rodríguez
fca070fe9e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding tests for and fixing the behavior of `cake acl initdb` it now correctly delegates to SchemaShell.  Fixes #608
  Making TestTask not depend on Inflection rules for creating directory names,  refs #610
  Adding tests for Inflector::rules() clearing cached values.  Fixes #609
  Clear cache of pluralized, singularized and tableize when set rules.
2010-04-22 16:50:25 -04:30
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
Mark Story
568e9d3a89 Adding tests for and fixing the behavior of cake acl initdb it now correctly delegates to SchemaShell. Fixes #608 2010-04-21 23:28:40 -04:00
Mark Story
1d3b653e57 Adding tests for Inflector::rules() clearing cached values. Fixes #609 2010-04-21 22:49:48 -04:00
Mark Story
120fdd9045 Removing other uses of Routing.admin as it has been removed from Router. 2010-04-20 23:43:51 -04:00
Mark Story
a71a8a89b2 Removing support for Routing.admin. Use Routing.prefixes instead. 2010-04-20 23:40:13 -04:00
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
2010-04-19 23:25:57 -04:30
Mark Story
7bf594ff17 Removing private method access, and removing tests for features that will be removed. 2010-04-19 23:54:09 -04:00
Mark Story
e92e212b8d Fixing Router's constructor.
Adding static visibility to Router methods.
Adding a method for testing Router extensions.
Router::mapResources() now returns the mapped resources
Fixing visibility issues in test cases.
2010-04-19 23:44:45 -04:00
Mark Story
f86d0de5ee Adding test to show correct functioning of containable + field() + recursive = -1. Closes #409 2010-04-19 23:16:59 -04:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
Mark Story
2bf9504cfb Removing inheritance from Object.
Adding missing visibility keywords, and adding static keywords.
Removing @tags.
2010-04-19 00:10:22 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
2010-04-18 01:02:39 -04:00
Mark Story
4425743bcd Adding tests for creating cache configs of different types in sequence. Demonstrates error explained in #596. 2010-04-17 18:50:28 -04:00
Mark Story
9ae8b737dc Trimming trailing whitespace. 2010-04-17 13:05:26 -04:00
Mark Story
ae8ace79fa Adding additional tests for JavascriptHelper::object() options. Closes #588 2010-04-17 12:44:04 -04:00
Mark Story
78f14401ca Fixing issue where using delivery = debug and not using sessions would cause a fatal error. send() will now return the contents that would get written into the session. Fixes #595 2010-04-17 12:27:50 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
c7fcaf995f Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
predominant
0384ecad30 Removed remaining @filesource lines. 2010-04-16 02:48:47 +10:00
predominant
591eb43b26 Finalise shortcut translation function application. 2010-04-16 02:43:43 +10:00
predominant
74d7682707 Fix translation shortcut usage through testing console for updates 2010-04-16 02:38:12 +10:00
Mark Story
17949ff9fc Adding accessor to fix issues in test cases.
Removing check for php4 method name.
2010-04-14 23:36:47 -04:00
Mark Story
286e96624b Removing reference operators and removing DS in TestManager and CakeTestCase. 2010-04-14 23:31:15 -04:00
Mark Story
20b0b1ff58 Removing reference operators in CakeTestFixture.. 2010-04-14 23:27:34 -04:00
Mark Story
7705c404ee Fixing / adding visibility.
Removing DS usage as its not needed in php5.
Removing reference operators.
2010-04-14 23:24:44 -04:00
Mark Story
50243f3b84 Fixing tests failing because of visibility. 2010-04-14 23:00:22 -04:00
Mark Story
79eeb33e35 Fixing constructors
Adding method visibility.
Removing reference operators.
2010-04-14 22:56:51 -04:00
Mark Story
4ef899fa54 Updating test suite to say 2.0! 2010-04-14 22:41:12 -04:00
Mark Story
c4d57bd6e7 Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper. 2010-04-14 00:13:33 -04:00
Mark Story
508e0a2d9a Removing all the deprecated PHP4 compatibility functions, and the shortform aliases. Removing associated tests. 2010-04-14 00:01:40 -04:00
José Lorenzo Rodríguez
0300fc1c31 If connection is aborted, now MediaView returns false after stopping the transfer 2010-04-13 16:55:22 -04:30
José Lorenzo Rodríguez
940ce8b06e Adding some test coverage on MediaView.
Now MediaView does not exit after successful render, closes #569
2010-04-13 16:44:14 -04:30
Mariano Iglesias
a6b83cdd93 Fixing issue where TextHelper::autoLinkUrls was failing on some expressions 2010-04-13 15:39:30 -03:00
José Lorenzo Rodríguez
3fc212fe28 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-13 01:09:42 -04:30
José Lorenzo Rodríguez
9d2819970d Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564 2010-04-13 01:08:31 -04:30
predominant
4982705d07 More time helper test jiggering. Some peope still experiencing issues. 2010-04-13 15:06:44 +10:00
predominant
df76ff47e3 Fix TimeHelper tests failing due to timezone changes. 2010-04-13 12:20:58 +10:00
Mark Story
404401b4de Moving action modification when a prefix is detected so it affects all url arrays. Previously it was only applied to parameters in the current request. This fixes inconsistencies between request parameters and url parameters. Fixes #570 2010-04-11 23:13:18 -04:00
predominant
2e3d45c3de Added public access to public method in CakeTestFixture 2010-04-11 15:22:25 +10:00
predominant
4cb06d83ea Fix CakeSession tests so they dont call protected methods. 2010-04-11 15:18:55 +10:00
Mark Story
561e5fa556 Adding an additional test for plugin + prefix routing. 2010-04-10 21:15:56 -04:00
Mark Story
955192a4ca Updating dispatcher tests to reflect changes in default plugin routes.
Removing tests for routes that have been removed.
2010-04-10 21:14:18 -04:00
Mark Story
e1253f0bb5 Including a plugin short route for prefixes as well. There were failing Dispatcher tests relying on this. 2010-04-10 21:12:48 -04:00
predominant
ed02b0f54b Fixing access modifier test on Test task. 2010-04-11 09:40:54 +10:00
predominant
4b919382bb Fix Console Model test to correct index changes for validation. 2010-04-11 09:19:30 +10:00
Mark Story
6c357ee555 Adding tests from 'tfs' fixes inconsistencies in extracting elements with one path selector. Fixes #555 2010-04-10 16:57:50 -04:00
Mark Story
fbaabad6bb Fixing issues where route parameters that overlapped could cause route compilation errors. Tests added. Fixes #565 2010-04-10 11:17:24 -04:00
José Lorenzo Rodríguez
ceb2a1d4ed Removing date_default_timezone_set, as it is only available in php 5+
Hoping for the days were this type of commit is no longer needed
2010-04-09 09:40:27 -04:30
predominant
b22b3b1f41 Fix a bunch of fixture tests testing for access modifiers. 2010-04-09 22:58:06 +10:00
predominant
75c741f5a6 Fix scaffold test on console, replaced 'var' with 'public'. 2010-04-09 22:55:43 +10:00
predominant
14280d6b5f Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:07:16 +10:00
predominant
90a468bf9f Removing mention of external site from test cases. 2010-04-09 22:06:06 +10:00
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
predominant
21f61ee34a Merge remote branch 'origin/1.3' into 1.3 2010-04-09 21:58:25 +10:00
predominant
cb0ae6ed76 Fixed TimeHelper tests. Force setting of timezone to GMT+5 to ensure tests are passing. 2010-04-09 21:20:01 +10:00
predominant
ac81ba75cb Added timezone setting to allow tests to pass in all timezones. 2010-04-09 21:17:55 +10:00
predominant
ea635d6bea Fix protected call for _build on CakeSchema, and associated references. 2010-04-09 20:41:28 +10:00
Mark Story
30e6c57a96 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 23:37:27 -04:00
Mark Story
c38249ac28 Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
predominant
19b66b8617 Change luhn validation to public. 2010-04-09 13:30:58 +10:00
José Lorenzo Rodríguez
05af213d59 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-08 22:26:04 -04:30
José Lorenzo Rodríguez
03e3c3249f Removing whitespace at the end of the file 2010-04-08 22:15:49 -04:30
Mark Story
94391d71c2 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 22:41:55 -04:00
Mark Story
9d3a2c61d4 Removing test that is no longer relevant due to changes in Router. 2010-04-08 22:40:45 -04:00
José Lorenzo Rodríguez
7eb3055720 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding PluginShortRoute into default connected routes.  Fixes issues with the framework having built in 404s.
  Implementing PluginShortRoute and some tests for its methods.
  Fixing tests that started failing because of removal of short routes on reverse routing.
  Removing plugin shortcuts entirely.
  Adding additional test for plugin shortcut routes including prefixed shortcut routes.
  Updating doc block for Router::__connectDefaultRoutes()
  Removing Dispatcher::_restructureParams() as it is no longer used.
  Moving expectations inline.
  Fixing tests that should have never worked, and removing additional calls to _restructureParams.  Adding in prefixed plugin shortcuts as they were missing.
  Modifying Dispatcher tests to modify private variables (which is bad, but there is no way to change which plugins Router uses to create patterns).  This allows the removal of two calls to _restructureParams.
  Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests.
  Adding doc blocks to PluginShortRoute.  Adding PluginShortRoute into Router.
  Shrinking number of lines in dispatcher test case.
  Adding PluginShortRoute, and a few test cases.
2010-04-08 18:24:24 -04:30
José Lorenzo Rodríguez
59f7cb47d3 Improving test coverage on FormHelper to show the usage of the 'secure' key for inputs.
Fixing issue with select inputs that does not honor the value of 'secure'
2010-04-08 18:23:07 -04:30
Mark Story
4d780ee1f3 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 00:04:14 -04:00
Mark Story
0427fe9777 Merge branch 'no-shortcuts' into 1.3 2010-04-08 00:03:58 -04:00
Mark Story
81dc0d42b9 Adding PluginShortRoute into default connected routes. Fixes issues with the framework having built in 404s.
Adding tests for the default connected routes.
2010-04-08 00:03:46 -04:00
José Lorenzo Rodríguez
7668894888 Fixing error introduced by previous commit 2010-04-07 09:51:29 -04:30
Mark Story
131578cb42 Implementing PluginShortRoute and some tests for its methods. 2010-04-06 23:05:04 -04:00
Mark Story
07efd76b42 Fixing tests that started failing because of removal of short routes on reverse routing. 2010-04-06 22:44:23 -04:00
ADmad
b3f860b762 Adding test case for Validation::url(). Disproves #552 2010-04-07 02:20:05 +05:30
predominant
e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5 Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379 2010-04-05 21:50:28 -04:00
predominant
51d71b4541 Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests. 2010-04-05 21:15:17 +10:00
predominant
50a547167b Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
Mark Story
d990c6ed44 Adding tests for single quoted attributes to assertTags(). Because of the __array_permute works ensuring quotes match is a non-trivial problem. Fixing single quoted attributes not being matchable with assertTags(). Fixes #539 2010-04-04 21:43:29 -04:00
predominant
14b6a7ac5e Fixing access to private and protected variables in Xml class. 2010-04-05 08:57:40 +10:00
Mark Story
bdd8811924 Removing plugin shortcuts entirely. 2010-04-04 16:34:07 -04:00
José Lorenzo Rodríguez
45ccba5d94 Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524 2010-04-04 13:24:39 -04:30
predominant
3039645a17 Fix testing of protected baseConfig in CakeSocket. 2010-04-04 18:34:49 +10:00
predominant
3c2e7a091d Changed access to private __associations on Model to associations() calls. 2010-04-04 18:17:43 +10:00
predominant
97388d2e61 Fixed access to protected property in CakeSession tests. 2010-04-04 17:21:01 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
predominant
29dc12dbc2 Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
Mark Story
e57e8f3962 Adding additional test for plugin shortcut routes including prefixed shortcut routes. 2010-04-04 00:21:21 -04:00
Mark Story
87f1972f75 Moving expectations inline. 2010-04-03 23:37:31 -04:00
Mark Story
ed60939292 Fixing tests that should have never worked, and removing additional calls to _restructureParams. Adding in prefixed plugin shortcuts as they were missing. 2010-04-03 23:32:14 -04:00
Mark Story
2814ddc2d5 Modifying Dispatcher tests to modify private variables (which is bad, but there is no way to change which plugins Router uses to create patterns). This allows the removal of two calls to _restructureParams. 2010-04-03 22:24:31 -04:00
Mark Story
95802176bb Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests. 2010-04-03 17:10:39 -04:00
Mark Story
f605454aca Shrinking number of lines in dispatcher test case. 2010-04-03 16:29:36 -04:00
Mark Story
874c511fe2 Adding PluginShortRoute, and a few test cases. 2010-04-03 16:29:20 -04:00
Mark Story
558a9db642 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-02 15:51:00 -04:00
Mark Story
3503872ab8 Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 2010-04-02 15:50:43 -04:00
ADmad
1b8165d890 Enhancing email component to allow using alias for attachments. Closes #6 2010-04-03 00:37:02 +05:30
Mark Story
e6f9c420b6 Removing transactional property from the Set test, as it was removed from the Model in the last commit. Ref #531 2010-04-02 13:55:05 -04:00
Mark Story
d058234c1c Adding tests to PaginatorHelper::sort() for creating sort links that point at plugin shortcuts. Refs #535. 2010-04-02 13:43:03 -04:00
Mark Story
ffb5c36578 Adding tests for plugin shortcut route generation. Refs #535 2010-04-02 13:32:14 -04:00
ADmad
d92202c6da Fixed controller test case which generated a property undefined notice 2010-04-02 00:01:06 +05:30
Mark Story
176c12e5fe Adding tests for creating directories with trailing slashes. Closes #520 2010-03-30 22:35:49 -04:00
José Lorenzo Rodríguez
75900883e6 Making DboPostgres::value() return NULL when given an empty array, as DboMysql does 2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb Using value() in default value generation with CakeSchema and DboPostgres 2010-03-29 23:50:40 -04:30
predominant
84ad35ca7a Added test for XML Helper serialization. Refs #284 2010-03-29 12:21:14 +11:00
Mark Story
068631ebe2 Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added. 2010-03-28 16:59:24 -04:00
ADmad
d365fafe4d Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false 2010-03-28 05:29:42 +05:30
Mark Story
7b28fdec85 Fixing Security::cipher() not being able to correctly decrypt numeric values. Fixes #513 2010-03-27 17:19:42 -04:00
Mark Story
1210a4f598 Fixing whitespacing. 2010-03-27 16:28:59 -04:00
Mark Story
8ab5abe852 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 16:28:00 -04:00
Mark Story
3040c6f586 Moving tests around in set test. 2010-03-27 16:27:23 -04:00
Mark Story
35446a42a9 Making filtering of extracted arrays remember their key. This fixes attribute selectors followed by parent selectors returning seemingly random results. Fixes #502 2010-03-27 16:23:46 -04:00
Mark Story
3075eda8b6 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 14:30:27 -04:00
Mark Story
b559be5822 Moving xml_parser_free() so parser resources are freed immediately after they are used. Helps reduce memory consumption in Xml class. Refs #505 2010-03-27 12:48:31 -04:00
Mark Story
0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
predominant
9bd0960cf1 Merge remote branch 'origin/1.3' into 1.3 2010-03-26 20:36:04 +11:00
predominant
0dfc07ba0d Fixes #53, ordering of XML::toArray() operations. 2010-03-26 20:30:17 +11:00
predominant
ec3f4b8d34 Fixes #53, ordering of XML::toArray() operations. 2010-03-26 19:59:09 +11:00
Mark Story
888fdd3dd5 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-25 23:44:53 -04:00
Mark Story
d20aa23711 Fixing issues where paths added to build() would be appended into the search paths after the default paths.
Fixed issue where paths added with build() would be lost when calling build() again to change a different path type.
Tests updated.
Fixes #410
2010-03-25 23:44:40 -04:00
predominant
5d3f0d7fe0 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:36:40 +11:00
predominant
9f5949ab52 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:29:27 +11:00
José Lorenzo Rodríguez
41734503a6 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Supporting Model.* syntax on postgres.
  Changing variable $title to $title_for_layout. Closes #511

Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500 Qouting fields inside postgres functions when prepended a DISTINCT, closes #512 2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d Supporting Model.* syntax on postgres. 2010-03-25 17:33:34 -03:00
Mark Story
4f4d3f9ffe Fixing extraction of non-zero arrays with only one element and attribute selectors. Fixes #475 2010-03-24 23:25:02 -04:00
Mark Story
cbb65ca85f Moving failing test into new method for non-zero array extraction. 2010-03-24 22:36:38 -04:00
Jimmy Bourassa
e8e520d6f2 Added test case for a bug in Set::extract
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-24 22:34:41 -04:00
Mark Story
9d3f2fb4a7 Moving Non-Zero tests for Set::extract() into a separate method. 2010-03-24 22:33:51 -04:00
Mark Story
9334aeabc2 Adding tests for loading helpers off of additional paths. Closes #410 2010-03-24 22:11:53 -04:00
Mark Story
3883f728fb Adding tests for Fixture importing. Fixing importing fixtures for databases that require custom fields handling like postgresql. Fixes #481 2010-03-22 23:28:58 -04:00
Mark Story
817ebf5ec8 Merge remote branch 'ceeram/1.3-467' into 1.3 2010-03-21 20:41:54 -04:00
Juan Basso
5e8665cd8d Allowing routes to set an extension when Router::parseExtension() is
being used.  Fixes #492

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:23:48 -04:00
Matt Curry
cc59b04ad3 fixed bad path for css on windows
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:01:52 -04:00
Ceeram
6d13f0d3d1 added test for ticket #469
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 18:22:42 -04:00
Phally
7f7315e6d2 Added alphabetic sorting to the plugin list in the test suite.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 17:48:03 -04:00
Ceeram
7337c12f4f test for ticket #467 2010-03-19 01:48:28 +01:00
ADmad
6a723bb515 Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477 2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
0f876e1a1b Merge branch 'saveAll' into 1.3
* saveAll:
  Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430 Making saveAll() behave like plain save() when suplied empty data array, closes #277 2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
28cb57a92c Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520 Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
85f5750c81 Changing fixture data to avoid postgres error. Manually inserted id does not increment sequence 2010-03-16 18:09:27 -04:30
José Lorenzo Rodríguez
c51f4076f7 Forcing order on find('all') in test. It is not safe to asume returned row order in postgres 2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
201a952218 Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table 2010-03-16 15:12:27 -04:30
AD7six
0c951b7248 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
661fcd32ab Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields. 2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81 Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459 2010-03-15 22:55:14 -04:00
Mark Story
3ab687043e Updating DboPostgres test to reflect changes in test suite. 2010-03-14 19:27:36 -04:00
ADmad
70d0c64283 Removing constant REQUEST_MOBILE_UA, and added variable $mobileUA instead for mobile browser detection. Also added new user agent string 'webOS', closes #457 2010-03-15 01:58:38 +05:30
Mariano Iglesias
1120d0daff Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642 Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:34:57 -03:00
Mark Story
a51cceab18 Merge branch 'dbo-source-cache' into 1.3 2010-03-14 15:11:48 -04:00
Mark Story
5ec965830c Fixing issues caused by daylight savings time switch. 2010-03-14 13:20:52 -04:00
Mark Story
78f347afd7 Fixing SchemaShell test, was failing due to a model in the test_app changing. 2010-03-14 13:06:22 -04:00
Mark Story
c059cf5175 Implementing cacheMethod(). Helps to solve #458, as it provides features to control and clear method caches. 2010-03-13 22:55:18 -05:00
Mark Story
49c60658b9 Fixing the ability to use regular expressions for validation rules. Fixes #453 2010-03-13 19:44:20 -05:00
ADmad
688daf2c35 Allowing the default transliteration map used in Inflector::slug to be customized using Inflector::rules. Closes #321, #334, #439. 2010-03-14 02:22:46 +05:30
Mark Story
178099d15b Adding test that closes #455 2010-03-13 00:26:23 -05:00
Mark Story
028668b7a6 Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450 2010-03-13 00:18:51 -05:00
Mark Story
e304c48ec4 Adding test to show that select() doesn't always auto select options named 'Array'. Disproves #412 2010-03-12 23:17:11 -05:00
Mark Story
677ff2d8b7 Removing outcommented code. 2010-03-12 23:03:06 -05:00
Mark Story
8e8acfaccd Fixing notice errors when bogus validation options are selected. Refs #453 2010-03-12 22:58:14 -05:00
Mark Story
239e34f032 Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-03-10 21:49:55 -05:00
Mark Story
64c627a352 Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:49:22 -05:00
Mark Story
4c668c036c Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:46:28 -05:00
José Lorenzo Rodríguez
d8a757ce75 Fixing empty value check to avoid a mistaken default value selection in Helper::value. closes #290 2010-03-10 15:16:02 -04:30
Dieter Plaetinck
9a9bc3643b fix typo in DboPostgresTestDb::testOrderAdditionalParams() 2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time 2010-03-09 16:09:16 -04:30
José Lorenzo Rodríguez
acccf964a5 Fixing some tests for Postgres Dbo and adding test cverage for extra params in order function, closes #353 2010-03-09 15:24:03 -04:30
Mark Story
af317a107b Fixing issues in Set::combine() when data or paths used result in empty datasets. Tests added. Fixes #414 2010-03-08 23:07:36 -05:00
Mark Story
bed4027d37 Making JsHelper::writeBuffer() use the isAjax param to hint the domReady() event. Disabling domready events when the request isAjax fixes issues in prototype and makes output code simpler. Fixes #429 2010-03-08 22:51:46 -05:00
predominant
2218d186c8 Revert "Fixing escaping of forward slash for JS Engines."
This reverts commit 7334fdfbdf.
2010-03-09 14:30:28 +11:00
predominant
7d81d81176 Merge remote branch 'origin/1.3' into 1.3 2010-03-09 12:28:06 +11:00
predominant
7334fdfbdf Fixing escaping of forward slash for JS Engines. 2010-03-09 12:26:25 +11:00
Mark Story
e6664f0ea4 Fixing SQL errors when running model_behavior tests with postgresql. Fixes #406 2010-03-07 19:02:19 -05:00
Mark Story
1ae922cea1 Fixing missing reference operators in test cases. 2010-03-05 22:06:20 -05:00
Mark Story
af92276ba9 Adding missing reference operators to getInstance methods. 2010-03-05 21:41:48 -05:00
Mark Story
7b83c45168 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-05 21:31:10 -05:00
Mark Story
220fba9bba Fixing inflection of parameters when using bake. Model, View, Controller, and Fixture tasks all accept either singular or plural forms of the table name. Fixes #425 2010-03-05 21:30:58 -05:00
José Lorenzo Rodríguez
e4a5ca528c Fixing virutal fields fetching for postgresql, closes #417 2010-03-05 16:07:59 -04:30
Mark Story
1d449e3847 Refactoring label generation into a method.
Fixing issues with labels having a for attribute = Array when an array of id's is provided.
Fixing issues where a date input would require you to provide id keys for hour, minute, and meridian even if you were not using them.
Fixes #411
2010-03-04 22:46:43 -05:00
Mark Story
f8cb20e994 Passing interactive property to inner tasks. Inner tasks now share the parent interactive setting making things more consistent. Fixes #423 2010-03-04 22:02:49 -05:00
Mark Story
d4393e9058 Fixing path generation in BakeTask.
Removing name properties as they were causing troubles.
All BakeTasks are now interactive = false by default.  This makes interfaces more consistent when working with bake.  Refs #423
Tests updated.
2010-03-04 21:57:48 -05:00
predominant
382e11ccde Changed Configure::write to return true on success. Maked testing result simpler. 2010-03-04 10:20:15 +11:00
hiromi2424
256ce41b1f LC_TIME support multi-byte value. 2010-03-02 23:51:22 -04:30
Mark Story
3b3987de7f Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-28 13:52:02 -05:00
Mark Story
65169971d4 Making memory leak test work with margins present in php5.3.1 2010-02-28 13:51:47 -05:00
Mark Story
428ee1998a Updating paths so app layout doesn't break tests. 2010-02-28 13:44:04 -05:00
Mark Story
dbe35a495c Updating Object test to include fixtures for both comment fixtures. 2010-02-28 13:34:37 -05:00
Mark Story
2a19a8d5e4 Updating CakeSchema test so it runs in both solo and group contexts. Changing table used on TestPluginComment to match its name. 2010-02-28 13:31:23 -05:00
Mark Story
27ffd43214 Fixing issue in component test where AppController will cause failing tests due to bleed through. 2010-02-28 12:48:34 -05:00
José Lorenzo Rodríguez
29eed5f5e8 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-02-28 13:09:15 -04:30
Mark Story
a6efda66b8 Adding fixtures to fix errors in schema shell test case. 2010-02-28 12:38:49 -05:00
José Lorenzo Rodríguez
f0e73e1158 Changing order of expectations to get more correct results 2010-02-28 13:08:36 -04:30
Mark Story
4256cbc6f8 Fixing fails in apishell test. 2010-02-28 12:28:31 -05:00
Mark Story
6360d8d306 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-28 12:26:54 -05:00
Mark Story
322d8e667c Removing duplicate method. 2010-02-28 12:26:15 -05:00
José Lorenzo Rodríguez
d5fa897681 Adding tests for startupProcess and shutDownProcess in controller
Fixing variable reference
2010-02-28 12:55:35 -04:30
Mark Story
e0eb48d250 Adding expectError to catch errors coming from FileEngine.
Fixing incorrect tests in ApcTest.
2010-02-28 12:15:25 -05:00
Mark Story
75e98387e7 Removing debug() from test case. 2010-02-28 11:39:09 -05:00
Mark Story
e0abe99d7d Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/html.php
	cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
Mark Story
37cf55470f Adding tests for Component::triggerCallback(). Deprecating other Component methods, as they are just wrappers for triggerCallback(). 2010-02-28 01:49:19 -05:00
José Lorenzo Rodríguez
1f1e0f4ff7 Merge commit 'origin/1.3' into 1.3-form 2010-02-27 23:23:43 -04:30
José Lorenzo Rodríguez
b782563daf Adding test for form input templates 2010-02-27 23:18:21 -04:30
José Lorenzo Rodríguez
0ca5c11e6c Making the form helper put the "required" class on all imputs that have a validation rule and does not explicitly sets allowEmpty => true in validation array 2010-02-27 22:58:27 -04:30
Mark Story
ec5d9729b0 Model::find(first) no longer uses the id set in a model as the default conditions. Fixes #266 2010-02-27 11:32:29 -05:00
Mark Story
0960abcfb9 Removing workaround code for PHP 5.3.0. Error is no longer being generated in PHP 5.3.1 2010-02-27 11:26:16 -05:00
Mark Story
3192e130af Fixing magic select creation for fields that have plural variables added to the view. 2010-02-27 11:01:28 -05:00
José Lorenzo Rodríguez
9a4de854d6 Improving the guessing process of required fields in the form helper.
Now it does not rely on the "required" property of the validation array anymore, which was misleading
2010-02-23 09:55:01 -04:30
Mark Story
fbf054b22b Making FileEngine emit errors when a path does not exist but is used for caching. Should make cryptic errors coming from Cache easier to figure out. Removed useless private property.
Tests added.
Fixes #384
2010-02-22 23:21:30 -05:00
Mark Story
b1a3e05374 Fixing failing tests in ControllerTask. 2010-02-21 22:37:18 -05:00
Mark Story
1c7c748a7c Merge branch 'view-all' into 1.3 2010-02-21 22:29:22 -05:00
Mark Story
8615274e7f Fixing issue where baking a model non-interactively would omit hasMany associations. Tests added. 2010-02-20 20:13:42 -05:00
Mark Story
7075aa5e86 Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323 2010-02-20 11:42:17 -05:00
Juan Basso
416abed211 Test of ticket #323.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-02-20 11:35:54 -05:00
Mark Story
763aa524b9 Fixing recursive directory creation when nested create() calls fail. Fixes #347 2010-02-20 11:25:46 -05:00
Mark Story
06fc87fc2d Fixing lack of space in meta tags lacking a link attribute.
Fixes #371
2010-02-20 01:41:56 -05:00
Mark Story
f4c670e5be Fixing lack of space in meta tags lacking a link attribute.
Fixes #371
2010-02-20 01:39:15 -05:00
Mark Story
6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
Mark Story
96bbbb2d72 Applying fixes made to JavascriptHelper to JsBaseEngine. 2010-02-17 22:27:52 -05:00
Mark Story
c7de42033c Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-17 22:23:16 -05:00
Mark Story
ab688b88f4 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:22:53 -05:00
Mark Story
2209f198f8 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:21:48 -05:00
renan.saddam
63f7900ba1 Checking if the last query returned a error, tests added. Fixes #72. 2010-02-17 22:31:00 -03:00
Mark Story
42a5665660 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-16 23:19:11 -05:00
Mark Story
0b1efd3e86 Fixing delivery of plugin assets that reside in the root of a plugin webroot directory. Tests added. 2010-02-16 23:18:49 -05:00
Mark Story
2279b1a736 Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297 2010-02-16 22:35:16 -05:00
renan.saddam
d7b49e3494 Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324. 2010-02-15 14:46:18 -03:00
Mark Story
f04add4f79 Fixing querystring parameters being chopped off of absolute webroot asset paths. 2010-02-13 20:43:02 -05:00
Mark Story
d7dd63de82 Adding the ability to bake all views for one specific action. Tests added. Fixes #251 2010-02-13 19:07:42 -05:00
Mark Story
6ccc43d776 Adding tests for Cache not generating errors when Cache.disable = true. Refs #286 2010-02-13 18:51:39 -05:00
Mark Story
3f667eb412 Adding skipTables to ModelTask. Allows skipping of predefined tables. Adding i18n table to the default list of skipped tables. Fixes #327 2010-02-13 18:15:11 -05:00
Mark Story
b89f40be80 Adding file omitted from [46948dd2c0] 2010-02-13 17:56:19 -05:00
Mark Story
5f5aae71e7 Adding property to signal which actions to skip finding templates for. Fixes #330 2010-02-13 17:51:49 -05:00
Mitchell Amihod
2e8e233f73 Fixing syntax error for baked component test case. Updated relevant
test case.

Fixes #342.

Signed-off-by: Joël Perras <joel.perras@gmail.com>
2010-02-13 16:40:55 -05:00
Mark Story
7a655f7fde Fixing broken skipIf commited in 46948dd2c0 2010-02-12 23:51:02 -05:00
renan.saddam
5653c720f0 Fixing an small error with token parsing, tests added. Refs #333. 2010-02-12 11:52:58 -02:00
renan.saddam
d975dc3190 Adding tests for previous commit. Refs #310. 2010-02-12 02:01:54 -02:00
renan.saddam
06109a2eed Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-12 01:57:38 -02:00
Mark Story
46948dd2c0 Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329 2010-02-11 22:57:24 -05:00
renan.saddam
d5ea6b7c2a Flushing the CR after a model is baked, tests added. Refs #310. 2010-02-12 01:57:04 -02:00
Mark Story
0ce14ceb7e Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307 2010-02-11 22:03:43 -05:00
Mark Story
0fda18d11c Fixing entity encoding of url strings inside remoteFunctions contained in safe CDATA blocks. Fixes #127 2010-02-08 23:07:13 -05:00
Mark Story
9edf2d1d80 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-07 16:45:55 -05:00
Mark Story
7384f56144 Fixing issues with old method names being used in EmailComponent. 2010-02-07 16:45:36 -05:00
ADmad
8c1c0e63c0 Allowing a html tag's attribute to be omitted from ouput by setting its value to null or false. Closes #316 2010-02-08 03:00:43 +05:30
Mark Story
6c3c5e9012 Merge remote branch 'rchavik/ticket_293' into 1.3
Conflicts:
	cake/libs/controller/components/email.php
2010-02-07 16:26:37 -05:00
Mark Story
843d3c7095 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-07 15:20:00 -05:00
Mark Story
1febd776bd Fixing include errors caused by empty asset filters in Dispatcher::asset(). Fixes #313 2010-02-07 15:19:47 -05:00
ADmad
6f08d86c8e Links generated by PaginatorHelper::prev and PaginatorHelper::next are now wrapped in 'span' or the tag specified in options. Fixes #311 2010-02-07 23:56:50 +05:30
Mark Story
104da15a73 Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289 2010-02-06 14:20:56 -05:00
Mark Story
e6404f2d06 Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289 2010-02-06 14:20:28 -05:00
Mark Story
f389591085 Merge remote branch 'phally/1.3-email_component' into email-integration 2010-02-04 21:36:26 -05:00
rchavik
f585630286 Test case: EmailComponent $to accepts array (closes 293) 2010-02-04 09:35:33 +07:00
Mark Story
4b269e3170 Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276 2010-02-02 20:39:33 -05:00
Mark Story
7daad4acaf Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00
Mark Story
2adac05dad Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276 2010-02-02 20:39:05 -05:00
predominant
8d382d9168 Fixes #288. TextHelper truncation not playing nice with html in ending. 2010-02-02 09:13:52 +11:00
José Lorenzo Rodríguez
aadf62de6e Improving tests for Set::diff 2010-01-31 20:26:57 -04:30
ADmad
59a4732eb8 Fixing issue where value of '$and' was appended to output string even when list array contained only one element. Fixed #285 2010-01-31 23:43:58 +05:30
Mark Story
7fb7c5ebf6 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-29 11:56:09 -05:00
Mark Story
f2a94f5959 Adding file omitted from [30cb38eb93] 2010-01-29 11:55:51 -05:00
Mark Story
887ddb9575 Adding tests for deletion of multiple habtm associations. Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records. Fixes #247 2010-01-29 11:55:18 -05:00
Mark Story
832b15ba3e Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated. 2010-01-29 10:06:47 -05:00
Mark Story
30cb38eb93 Refactoring extensions in ScaffoldView to reflect removal of magic .thtml extension.
Adding test for interaction of Themed views and Scaffolded views.  Fixes #255
2010-01-28 11:11:19 -05:00
ADmad
c9e047ce37 Adding 'orderYear' option for FormHelper::year to allow control over ordering of select options 2010-01-28 01:48:53 +05:30
Juan Basso
57997e770c Refactory of DboSource::name() to improve performance. Added more tests to it.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-27 12:24:06 -05:00
Mark Story
2d81d25f41 Fixing issue where webroot paths would be incorrect when using a virtual host setup and no mod_rewrite. An additional app/webroot would be appended. Incorrect tests updated. Fixes #259 2010-01-27 11:08:04 -05:00
Mark Story
827c65a767 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-26 17:57:25 -05:00
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
renan.saddam
a318ba43fd Enabling code coverage to run on 'All tests' group. 2010-01-26 17:22:07 -02:00
Mark Story
fc304056a3 Removing Session deletion of nonce token on blackhole. Fixes possible CSRF risk from multiple submissions of the same invalid data. Refs #214 2010-01-26 13:59:26 -05:00
renan.saddam
81414b7175 Enabling group code coverage on plugins outside APP/plugins path. 2010-01-26 15:00:19 -02:00
Mark Story
c195d654b3 Fixing TranslateBehavior test to run in php4. 2010-01-26 11:00:37 -05:00
renan.saddam
3e4a9631da Fixing notice due by using a non-existent variable. 2010-01-26 12:14:47 -02:00
José Lorenzo Rodríguez
f84a184360 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters.  Tests added for correct parsing of these routes.  Fixes #252
  Adding support for CURRENT_TIMESTAMP to all dbo's.
  Adding tests for CURRENT_TIMESTAMP to DboSource.
2010-01-25 14:13:13 -04:30
José Lorenzo Rodríguez
b24b43b848 Fixing docblock 2010-01-25 14:12:41 -04:30
Mark Story
38eac37bb1 Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252 2010-01-25 12:49:12 -05:00
Mark Story
5fcbc33a75 Adding tests for CURRENT_TIMESTAMP to DboSource. 2010-01-25 12:25:14 -05:00
Mark Story
98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:18:44 -05:00
José Lorenzo Rodríguez
03200440ed Fixing TranslateBehavior and $tablePrefix. Closes #168 2010-01-24 18:27:08 -04:30
Phally
3c265283e7 Added support for Message-ID headers. 2010-01-24 23:29:53 +01:00
Mark Story
5d35fd8d38 Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250 2010-01-22 10:30:22 -05:00
Phally
2e46504d05 Fixed failing test case due to changes in 1.3. 2010-01-21 23:07:42 +01:00
José Lorenzo Rodríguez
e77ed92646 Merge branch '1.3-cache' into 1.3
* 1.3-cache:
  Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
  Removing php5 visibility keywords.
  Fixing various errors related to Cache::increment() and Cache::decrement().
  Removing test ignore
  Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
ff7e906ba2 Removing php5 visibility keywords.
Fixing increment count tests in xcache test.
2010-01-21 14:06:18 -05:00
Mark Story
47c7387548 Fixing various errors related to Cache::increment() and Cache::decrement().
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
e150db2a45 Removing test ignore 2010-01-21 13:24:22 -05:00
Mark Story
2915493049 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6 Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223 2010-01-21 11:59:49 -05:00
José Lorenzo Rodríguez
dff7e17fa2 Adding atomic increment and decrement methods to cache engines, closes #234 2010-01-21 12:11:44 -04:30
ADmad
a8040506b0 Fixing spacing between button tag attributes. Fixes #241 2010-01-21 22:03:03 +05:30
Mark Story
913450daef Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208 2010-01-21 10:35:20 -05:00
Phally
984dc50f37 Merge commit 'upstream/1.3' into 1.3-email_component 2010-01-21 00:05:03 +01:00
ADmad
570c9e5304 Cleaning up commented and unneeded test cases and moving tests to more appropriate file 2010-01-21 01:42:54 +05:30
Mark Story
317463096a Refactoring tests in l10n that use object properties. 2010-01-20 14:53:57 -05:00
Mark Story
ae4a31f070 Making DEFAULT_LANGUAGE also set $language var which sets Config.language to a correct value. Fixes #228 2010-01-20 14:33:37 -05:00
renan.saddam
39dd15d3f6 Removing the with key from otherFields array, also fixing the page title. Tests added. 2010-01-19 14:05:29 -02:00
Mark Story
e1b0c41254 Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220 2010-01-19 09:22:13 -05:00
Mark Story
9f8e0e163e Removing getTests included by accident. 2010-01-18 21:59:18 -05:00
Mark Story
9b3a2fd658 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-18 21:57:46 -05:00
Mark Story
080e34718d Minor refactor, and adding tests from previous commit. Fixes #208 2010-01-18 21:57:03 -05:00
José Lorenzo Rodríguez
cb4a1f07e5 Fixing issue with persistModels and plugin models, closes #192 and #198 2010-01-18 13:13:10 -04:30
Mark Story
06ba7ac828 Adding omitted default route, and test cases to test its functionality. Fixes #212 2010-01-18 10:05:23 -05:00
Juan Basso
473e07a674 Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -05:00
Juan Basso
0ac99eddb5 Replacing "echo sprintf" by "printf" where possible. Fixes #209.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 00:56:22 -05:00
Mark Story
5203397a6a Adding error expectation to model_write test. Models using useTable = false, will still issue count queries to their datasources when exists() is called. 2010-01-16 20:24:27 -05:00
Mark Story
3be28fc749 Fixing errors in CakeTestCase::testAction tests case caused by changes in test suite not always forcing an output parameter. 2010-01-16 20:18:20 -05:00
Mark Story
0e09fee3b1 Correcting timehelper tests to use correct timestamp for indicated times. Making timezone output more resilient. 2010-01-16 20:14:57 -05:00
Mark Story
f1276ce337 Fixing several issues in the CodeCoverageManager test case. 2010-01-16 20:14:16 -05:00
Mark Story
c4ef429004 Changing require to require_once to make tests less order dependent. 2010-01-16 19:41:52 -05:00
Mark Story
34fed29d05 Renaming session test case.
Adding missing doc block to inflector test case.
Updating Set::map reverse test to reflect changes in Model.
Removing Inflector from lib group as the reset test breaks many other tests.
Adding a table property to the session fixture.
2010-01-16 19:19:12 -05:00
Mark Story
1acc4c879a Removing debug() from scaffold test. 2010-01-16 18:15:38 -05:00
José Lorenzo Rodríguez
1910a7f7ee Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Removing gettests from jsHelper test case.
2010-01-15 19:04:13 -04:30
José Lorenzo Rodríguez
3bd4cc07a6 Fixes to make TimeHelper and test cases more compatible with PHP 4 2010-01-15 17:48:41 -04:30
Mark Story
71254f3d5e Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 17:17:26 -05:00
Mark Story
476ef19fff Removing gettests from jsHelper test case. 2010-01-15 17:16:51 -05:00
ADmad
4c0a6d952f Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 03:34:14 +05:30
ADmad
2441849fa0 Replacing constant CIPHER_SEED with Configure class variable 'Security.cipher_seed' and renaming Security class method 'checkSessionKey' to 'checkSecurityKeys' 2010-01-16 03:26:26 +05:30
Mark Story
4f5ce7f94c Adding additional plugin 'shortcut' dispatching tests. 2010-01-15 16:18:19 -05:00
Mark Story
1a8c3fd405 Fixing infinite loops caused by stale caches. 2010-01-15 16:17:34 -05:00
Mark Story
c20aba6b9c Merge branch 'merger' into 1.3 2010-01-15 13:27:19 -05:00
Mark Story
f11068b831 Trimming trailing whitespace from files. Refs #201 2010-01-15 13:26:47 -05:00
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 00:11:33 -05:00
Mark Story
34c4af549c Adding missing reference operators for php4 compatibility. 2010-01-15 00:09:59 -05:00
Mark Story
f1a0690415 Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well. 2010-01-15 00:02:24 -05:00
Mark Story
276d183bdd Adding conditional to php5 only function use. 2010-01-14 23:40:18 -05:00
Mark Story
371ac3971a Fixing php4 compatibility in model_read test. 2010-01-14 23:38:24 -05:00
Mark Story
3a38e0869f Fixing php4 issues in ErrorHandler and ErrorHandler testcase. 2010-01-14 23:17:24 -05:00
Mark Story
036d7e6e13 Updating helper syntax. 2010-01-14 23:07:15 -05:00
Mark Story
d4d9ed7bfe Fixing test cases and php4 compatibility in Debugger. 2010-01-14 23:06:48 -05:00
Mark Story
5212406ea7 Making xml data test php5 only as Xml::compare() is non-functional in php4 2010-01-14 22:48:19 -05:00
Mark Story
5d280ea977 Making CodeCoverageManager and CakeSession tests run in php4. Removing test case for removed method. 2010-01-14 22:47:49 -05:00
Mark Story
2093f05ce7 Fixing php4 compatibility issues in CakeLog. 2010-01-14 22:33:14 -05:00
Mark Story
8f2a4a1e0e Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a Trimming trailing whitespace from files. Refs #201 2010-01-14 20:15:54 -05:00
Joël Perras
259b59cae1 Adding optional $reset parameter to Inflector::rules(). Fixes #91.
Inflector::rules() now has an optional 3rd parameter, $reset, which can
be set to true if you desire to remove the default inflections defined
in Inflector.

Note that the reset will only affect those inflection types which you
have explicitly re-defined in the $rules parameter.
2010-01-14 18:18:55 -05:00
Joël Perras
eb7e10db50 Updating Inflector::slug() handling of $map argument. Fixes #18.
When passing a $map to Inflector::slug(), the $map values will now
overwrite any default mappings that Inflector::slug defines.

Modified pre-existing test-case for Inflector::slug() when using a $map.
2010-01-14 17:51:14 -05:00
Joël Perras
adb0c809a0 Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199.
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
José Lorenzo Rodríguez
09b466f8aa Fixing whitespace and removig calls to Helper::output() introduced by error 2010-01-14 15:38:48 -04:30
José Lorenzo Rodríguez
0b3758dc91 Bug fix in I18n
Changing calls from date to strftime in TimeHelper
Implementing TimeHelper::converSpecifiers() to conver format strings to be windows safe and I18n friendly
Implementing TimeHelper::i18nFormat() to format dates with preferred locale date format
Changing TimeHelper::format() to handle inversion of first two parameters, while being backwards compatible. If called with the first parameter as a time string it will call TimeHelper::i18nFormat()
2010-01-14 14:11:57 -04:30
José Lorenzo Rodríguez
a980f72364 Refactoring I18n::translate() to return time format string or arrays when category is LC_TIME
Tests added
2010-01-14 09:54:45 -04:30
José Lorenzo Rodríguez
589972d581 Merge branch '1.3' into github-i18n
* 1.3: (137 commits)
  Updating tests to reflect SessionHelper's loss of magic inclusion.
  Removing SessionHelper's magical inclusion into the helpers array.  Use of SessionHelper must now be explicitly done. Tests updated.
  Fixing merge var test case for non magic session component.
  Fixing Pagescontroller test and removal of pageTitle from controller.
  Fixing component and controller test cases to work with less magical session component.
  Removing the magical addition of SessionComponent to components array.  This makes components more declarative, and removes magic that cannot be undone by the end developer.
  Fixing failing tests due to deleted assets.
  Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100.
  Updating CakeTestSuiteDispatcher parsing of .
  Adding missing </p> to Html test reporter template.
  Updating css file in skel dir.
  Fixing alignment issues in tables.
  Removing orphaned method.
  Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
  Adding php5 check to avoid errors when using __get() or __isset() methods in models
  Fixing include in test of CodeCoverageManager. Fixes #196
  Fixing var name when not have SimpleTest or XDebug installed.
  Moving skel/config/sql to skel/config/schema
  Fixing output of 'Actions' in bake templates.  Now outputs a __() call.
  Updating scaffolds to match new bake design.
  ...
2010-01-14 08:34:03 -04:30
Mark Story
1980a46b46 Updating tests to reflect SessionHelper's loss of magic inclusion. 2010-01-14 00:09:14 -05:00
Mark Story
a56bc5585c Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated. 2010-01-13 23:55:09 -05:00
Mark Story
a85da63956 Fixing merge var test case for non magic session component. 2010-01-13 23:49:11 -05:00
Mark Story
32832f4810 Fixing Pagescontroller test and removal of pageTitle from controller. 2010-01-13 23:49:11 -05:00
Mark Story
540e81b1b0 Fixing component and controller test cases to work with less magical session component. 2010-01-13 23:49:11 -05:00
Mark Story
eb2c34afa0 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-13 23:47:59 -05:00
Mark Story
67b69b3106 Fixing failing tests due to deleted assets. 2010-01-13 23:47:31 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
Joël Perras
88a09cfbb4 Updating CakeTestSuiteDispatcher parsing of .
Better handling of cases where dirname() of PHP_SELF returns only '/'.
2010-01-13 23:19:10 -05:00
Joël Perras
ff3aefe93a Adding missing </p> to Html test reporter template. 2010-01-13 23:19:09 -05:00
ADmad
848dc518ab Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes 2010-01-14 04:13:39 +05:30
Juan Basso
d8257518de Fixing include in test of CodeCoverageManager. Fixes #196
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:38:26 -05:00
Juan Basso
1c542b6ea5 Fixing var name when not have SimpleTest or XDebug installed.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-13 09:35:58 -05:00
José Lorenzo Rodríguez
4e3aedecde Fixing persitModel and plugin Behaviors. Closes #192 2010-01-13 09:53:00 -04:30
Mark Story
84840c7b04 Fixing issues with magic input() type detection and adding/updating tests. 2010-01-12 23:27:17 -05:00
Mark Story
d8e7aa929c Merge branch '1.3-misc' into 1.3 2010-01-12 17:18:14 -05:00
Mark Story
8e22e8cbea Merge branch '1.3-test-suite' into 1.3-misc 2010-01-12 09:31:07 -05:00
Mark Story
a0c3c4b803 Updating AuthComponent::startup() so that being redirected to loginAction with no Auth.redirect value in the session and a non empty loginRedirect defined, the Auth.redirect value is not overwritten. This prevents redirection to already accessible pages. Test cases updated.
Fixes #173
2010-01-11 23:54:06 -05:00
Mark Story
0803e2a5a6 Moving CLI code coverage generation into the CliReporter. 2010-01-11 18:04:08 -05:00
Mark Story
07b43be125 Making CLI case code coverage reports include text. 2010-01-11 18:00:45 -05:00
José Lorenzo Rodríguez
04562982b2 Fixing doc block 2010-01-11 15:34:16 -04:30
José Lorenzo Rodríguez
7e9fc9f705 Test case for date format definition using a LC_TIME locale file 2010-01-11 15:19:57 -04:30
José Lorenzo Rodríguez
50f58da60d Continuing work on locale definition file parser 2010-01-11 15:12:24 -04:30
José Lorenzo Rodríguez
8bc4f0336e Beginings of a parser of locale definition file 2010-01-11 15:09:42 -04:30
José Lorenzo Rodríguez
aa9258cbd1 Adding test for DboSource::group() and virtual fields
Closes #184
2010-01-11 12:22:59 -04:30
Phally
bbb105fc8c Added virtual field support for GROUP BY. 2010-01-11 11:46:59 -04:30
Mark Story
4ada5b7eea Fixing notice errors caused by incorrect datatyping in php4. 2010-01-11 09:44:51 -05:00
Mark Story
84e70c1db1 Adding linebreak for text/cli output situations. 2010-01-10 15:56:51 -05:00