Commit graph

452 commits

Author SHA1 Message Date
mark_story
7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
José Lorenzo Rodríguez Urdaneta
052f64b6cd Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-25 00:04:22 -04:30
José Lorenzo Rodríguez Urdaneta
4689be643b Migrating EmailTest to phpunit 2010-06-25 00:02:20 -04:30
mark_story
e2e26696f8 Moving 'group' files to top of the list. 2010-06-24 23:58:57 -04:00
mark_story
7f9f76d012 Migrating Controller group to PHPUnit. 2010-06-24 22:54:15 -04:00
mark_story
b3faa7f23b Fixing skips in ControllerMergeVarsTest. 2010-06-24 22:53:48 -04:00
mark_story
f8ff8596a2 Porting component group to PHPUnit. 2010-06-21 22:08:15 -04:00
Juan Basso
26d20b6d62 Fixing wrap for html mode in e-mails. Fixes #663 2010-06-21 00:37:25 -03:00
mark_story
2db510d1c1 Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832 2010-06-20 21:47:34 -04:00
mark_story
aee1c5483b Renaming test case classes to better reflect the filenames. 2010-06-13 10:06:00 -04:00
mark_story
f20cc8110b Adding a skip for persistModel as the feature is horribly broken right now. Controller test case is running with PHPUnit now. 2010-06-12 19:01:51 -04:00
mark_story
2ec6f75996 Adding two incomplete tests as they are not implemented. Pulling component tests out of the controller test case. 2010-06-12 18:47:47 -04:00
José Lorenzo Rodríguez Urdaneta
754376ca7e Migrating AclComponent test to phpunit 2010-06-10 20:17:35 -04:30
José Lorenzo Rodríguez
42e02bf289 Partially migrating EmailComponent test to phpunit, some tests need to have installed a local smtp server 2010-06-10 09:12:13 -04:30
José Lorenzo Rodríguez
d3ec9e1656 Converting CookieComponentTest to phpunit 2010-06-10 00:17:02 -04:30
José Lorenzo Rodríguez
fa8df12fa0 Converting AuthTest to phpunit. Adding setter and getter method loggedIn() 2010-06-10 00:03:49 -04:30
mark_story
2c6bf51bd2 Converting SessionComponent over to PHPUnit.
Adding a few getter/setter methods to fix visibility issues in the test cases.
2010-06-09 17:15:34 -04:00
mark_story
ac68f5c5db Updating Component test case to run on PHPUnit. 2010-06-09 00:13:52 -04:00
mark_story
c5e4ab2366 Adding return to RequestHandlerComponent::accepts() as it was missing.
Updating RequestHandlerComponent tests to work with PHPUnit.
2010-06-09 00:02:49 -04:00
mark_story
a88b8dd5b9 Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered.
Tests added.  Fixes #722
2010-06-07 23:43:35 -04:00
Kyle Robinson Young
a9fa7ac240 Fix for auth component userModel with plugins. Fixes #799 2010-06-07 23:19:13 -04:00
predominant
26d526f624 Fix AuthComponent tests for windows newlines. 2010-06-07 01:22:08 +10:00
Juan Basso
3c27c4c41e Ajusting smtpOption in EmailComponent. Fixes #779 2010-06-03 14:46:20 -03:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
mark_story
8acb82f567 Updating Security component to use CakeRequest and updating its test case. 2010-05-28 23:57:43 -04:00
mark_story
5a6db36a02 Fixing PagesController test case to use CakeRequest. 2010-05-27 00:28:51 -04:00
Juan Basso
bc3e745673 Support to EHLO in SMTP server for EmailComponent. Fixes #54, #712, #737 2010-05-24 22:24:58 -03:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
ef85fb1247 Making scaffold methods protected instead of private.
Adding visibility keywords
2010-05-17 23:30:04 -04:00
mark_story
1d884cc00f Updating Scaffold to use the CakeRequest object.
Updating Scaffold tests.
2010-05-17 23:11:47 -04:00
mark_story
f114d4299d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
b2d8536b3b Fixing Authcomponent tests. Updating the component + tests to use the new request object.
Deprecating a number of Authcomponent properties.
2010-05-15 00:55:15 -04:00
mark_story
36a71582fc Fixing issues with Controller::referer() and CakeRequest::referer(). Tests updated. 2010-05-15 00:53:15 -04:00
Richard Sbresny
05beaab272 Removed unnecessary unset
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:14:38 -04:00
Richard Sbresny
b04a3f8514 Switched over to using the previously unused Security::inactiveMins() method for getting timeout modifiers
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:14:20 -04:00
Richard Sbresny
a4950f6940 Updated session timeout calculations to use the security level from core.php as the multiplier.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:11:20 -04:00
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
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
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
26f7fcef3c Updating Controller and its tests to use CakeRequest. 2010-05-06 23:23:13 -04:00
Mark Story
1a460e47f1 Removing reference operators in Controller and its tests. 2010-05-06 22:48:48 -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
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
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