Commit graph

4684 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
22581516db Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/tests/cases/libs/controller/component.test.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
	lib/Cake/tests/cases/libs/controller/pages_controller.test.php
2010-12-18 00:04:44 -04:30
mark_story
24373ae3c1 Removing uses() it was deprecated in 1.3. Use App::import() instead. 2010-12-16 23:05:39 -05:00
mark_story
f50a97bff1 Making PagesController test unskipped in all_tests. 2010-12-16 22:53:00 -05:00
mark_story
42754c63ff Making more tests no longer skip in test suites. 2010-12-16 00:01:43 -05:00
mark_story
95f58321a8 Removing a duplicate test, and extra classes. 2010-12-15 23:54:28 -05:00
mark_story
339cb41ea2 Using $_mergeParent to unskip tests in test suites. 2010-12-15 23:49:54 -05:00
mark_story
862a2bc25e Removing duplicate class definition that could cause test suite inconsistencies.
Adding skip for when AppController is defined.
Changing how mock models are constructed to better use Model::__construct parameters.
2010-12-15 23:33:00 -05:00
mark_story
9dcea304c1 making assertions run against the test case, not the subject test case. 2010-12-15 22:19:44 -05:00
mark_story
5ff376e0a0 Adding parent calls. 2010-12-15 22:12:48 -05:00
mark_story
a054695dca Fixing failing tests. 2010-12-15 22:08:24 -05:00
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
Jeremy Harris
9e74283b90 Merge branch '2.0-1353' into 2.0 2010-12-14 20:42:03 -08:00
Jeremy Harris
904cb8a4a6 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-12-14 20:30:58 -08:00
Jeremy Harris
97c82e28a1 Fixed problems where running all tests will fail due to duplicate classes 2010-12-14 20:27:12 -08:00
mark_story
1531a7226e Removing duplicated tests, and tests for methods that are not implemented in the subclasses. 2010-12-14 23:26:24 -05:00
Juan Basso
a6014cfd8d Fixed the define name to run all socket tests. 2010-12-15 02:02:51 -02:00
Jeremy Harris
29441ca880 Added ObjectCollection test to libs group 2010-12-14 20:01:31 -08:00
Juan Basso
754c9b2c3d Updated to HttpSocket, HttpResponse and CakeSocket use SocketException. 2010-12-15 02:01:00 -02:00
Jeremy Harris
b9143dc7d4 Added ControllerTestCase class for testing controllers. Fixes #1244 2010-12-14 19:58:27 -08:00
Juan Basso
c0e2f63f7d Merge with 2.0-http. 2010-12-15 01:58:21 -02:00
Juan Basso
575da672b0 Fixed basic proxy test. 2010-12-15 01:54:37 -02:00
mark_story
84414eeb07 Removing CakeSession::watch() and CakeSession::ignore(). You should use logging, or an interactive debugger instead. 2010-12-14 22:35:43 -05:00
Jeremy Harris
10bf41a4df Merge commit '42a5ebf47b73bbdf200f0238e30e6d4893695f80' into 2.0 2010-12-14 19:00:26 -08:00
mark_story
19f9caed28 Fixing tests so they initialize the session, before trying to test things. 2010-12-14 21:59:53 -05:00
Jeremy Harris
9fa1bec0cb Move Controller::paginate() into PaginatorComponent 2010-12-14 18:21:39 -08:00
Juan Basso
cf7aae7911 Removed parseHeader from HttpSocket (it was not used). Moved the tests of parseHeader to HttpResponse. 2010-12-14 11:05:37 -02:00
mark_story
daf6084ccc Converting assertions to not use compatibility wrappers. 2010-12-13 23:59:57 -05:00
mark_story
106c1185b4 Making the id() test pass. 2010-12-13 23:59:57 -05:00
mark_story
8eebdffcbb Updating session to lazy start after the first time an operation has been performed. This should make controllers that only use sessions on some actions perform better. 2010-12-13 23:59:57 -05:00
Juan Basso
37303d9c37 HttpResponse::getHeader() is more flexible to accept a custom header list. 2010-12-14 02:52:40 -02:00
Juan Basso
2f64afe44e Allowing the user change the response class. 2010-12-14 02:46:31 -02:00
Juan Basso
176da15417 Moved the response methods from HttpSocket to HttpResponse. 2010-12-14 02:22:30 -02:00
Juan Basso
60a9d34027 Updated the HttpSocket to use the new HttpResponse. 2010-12-14 01:07:25 -02:00
Juan Basso
f45027ecd8 Adjusting HttpResponse responses in array to be more compatible. 2010-12-14 01:06:57 -02:00
Juan Basso
dfb76d67da Created the HttpResponse to get HttpSocket responses. 2010-12-14 00:16:45 -02:00
mark_story
2fe60142f5 Fixing more strict warnings. 2010-12-12 21:09:56 -05:00
mark_story
0ac8d04241 Fixing more strict warnings. 2010-12-12 21:02:42 -05:00
mark_story
f84871ae47 Fixing strict errors that were causing shell tests to fail.
Fixing test case for bake test that has been getting skipped.
2010-12-12 20:55:33 -05:00
Juan Basso
c20b5d7053 Renamed setAuthConfig to configAuth, and setProxyConfig to configProxy. 2010-12-12 23:48:04 -02:00
mark_story
017385d61c Fixing most of the strict errors in the helper test suite. 2010-12-12 20:21:14 -05:00
mark_story
dc7ff8911d Fixing tests in ComponentCollection and HelperCollection as return of trigger now depends on the triggered objects.
Removing annoying test that broke anytime something changed in Model.
2010-12-12 18:02:45 -05:00
mark_story
bf22af6b7f Fixing more strict errors and usage errors in BehaviorCollection test.
Making modParams only work if the result is an array.  This is for compatibility with previous behaviour.
2010-12-12 17:42:40 -05:00
mark_story
ce2e6053e4 Adding containable to the AllBehaviors test as it now runs. 2010-12-12 17:40:41 -05:00
mark_story
48879f8264 Fixing strict errors in translate and acl behaviors.
Removing conditional definition of I18nModel.  There is no reason for it to exist anymore.
Removing duplicate class definition.
2010-12-12 17:38:49 -05:00
mark_story
df21d19c4c Making a bunch of properties public so containable can hack around. Need to refactor and fix visibility issues.
Fixing failing tests in containable.
2010-12-12 15:48:36 -05:00
mark_story
10c358742b Making modParams ignore null results.
Test added.
2010-12-12 15:33:24 -05:00
mark_story
81e009b816 Fixing additional strict warnings. 2010-12-12 15:02:38 -05:00
mark_story
33b8a35b75 Fixing strict warnings in TreeBehavior and a few other classes. 2010-12-12 14:56:48 -05:00
mark_story
96968f7194 Moving the modParams option into ObjectCollection, so it can replace the specific trigger method in BehaviorCollection.
Changed how break behaves, so it is works better with modParams and collectReturn options.
Tests updated and expanded.
2010-12-12 14:10:22 -05:00
mark_story
d14d148948 Making scaffold form view names consistent with those used in bake.
Renaming test_app files.
Fixes #501
2010-12-12 13:18:28 -05:00