mark_story
c096eea664
Fixing failing tests caused by constants changing.
2010-12-05 23:32:34 -05:00
Jeremy Harris
8a7e2609cd
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-12-05 17:57:44 -08:00
Jeremy Harris
5eab027b84
Removed unnecessary pass by references
2010-12-05 17:28:15 -08:00
Mark Story
40585a34e8
Adding support for userPath in IniAcl.
...
Test case added.
Fixes #1291
2010-11-28 21:22:10 -05:00
Mark Story
3ddff879b1
Converting IniAcl to use IniFile, this removes one of the classes responsibilities.
2010-11-28 21:06:22 -05:00
Mark Story
1f72e504d5
Fixing incorrect imports that caused test case to fail in CLI when run by itself.
2010-11-28 20:49:42 -05:00
Jeremy Harris
1411e9495e
Fixed failing test due to missing CakeRequest class
2010-11-27 12:47:19 -08:00
ADmad
70ae66edf7
Fixing test cases for EmailComponent
2010-11-27 01:21:19 +05:30
mark_story
4214242efd
Adding test for correct merge order for $uses.
...
Fixing incorrect merge ordering for $uses, so it matches historical behaviour.
Fixes #1309
2010-11-24 22:44:12 -05:00
mark_story
0e29567f8d
Adding an array cast to fix issues where users could modify cookie
...
values causing iteration errors. Fixes #1309
2010-11-24 22:09:08 -05:00
mark_story
d5fb0b25cb
Fixing issue where Date header would be missing from Emails sent by
...
EmailComponent.
Adding user configurable field for date.
Test cases added. Fixes #1304
2010-11-22 22:08:46 -05:00
mark_story
cb657b158b
Fixing failing test and adding skip for test that will fail in a non-isolated case.
2010-11-21 14:39:07 -05:00
mark_story
8a129ec3a0
Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
...
Updating Controller and Shell usage to match new parameters.
2010-11-21 00:47:42 -05:00
mark_story
8f82156a51
Adding _mergeVars to Controller (this duplicated method will be re-factored away).
...
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
ae7855692d
Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
...
Tests updated.
2010-11-20 23:42:54 -05:00
mark_story
3237402fb8
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
f0ac462775
Updating test cases with failing tests.
2010-11-15 22:53:49 -05:00
mark_story
66e6ec763e
Merge branch 'dispatcher-request' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/tests/cases/libs/all_routing.test.php
cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
mark_story
6073ac5dfa
Fixing errors caused by accessing things that don't exist.
2010-11-13 23:57:01 -05:00
mark_story
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
01894b315f
Fixing issues caused by not accessing the request object correctly.
2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
b297bf633d
Updating test to be correct.
2010-11-09 23:55:42 -05:00
mark_story
6c0dfe9592
Fixing error where params[url] has moved.
2010-11-09 23:44:33 -05:00
mark_story
e431e86aa4
Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added.
2010-11-07 20:53:04 -05:00
mark_story
22497eb41c
Fixing failing tests in controller test.
2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8
Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated.
2010-11-07 13:23:45 -05:00
Mark Story
94f9f7afeb
Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest.
2010-10-31 22:42:16 -04:00
Mark Story
c2063f1229
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-10-31 21:58:38 -04:00
Mark Story
08e7bcb7ab
Merge branch '1.3' into integration
...
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35
Allowed the use of empty() and isset() in Controllers aliases properties.
2010-10-31 22:02:26 -02:00
mark_story
a57f8d3851
Adding another test for csrfUseOnce.
2010-10-24 20:57:12 -04:00
mark_story
22239b4481
Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript.
2010-10-24 20:26:31 -04:00
mark_story
4496a0a0bb
Reformatting code to use tabs.
...
Fixing issue with float comparison.
Fixes #219
2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964
Updating to match ticket, using radians() SQL function.
2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19
Adding testcase for ticket #219
2010-10-24 19:38:23 -04:00
mark_story
1c25e627ad
Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100 .
...
Fixes #1205 , Fixes #1204
2010-10-18 22:06:12 -04:00
mark_story
0c070f7131
Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit.
...
Fixing tests that were failing due to XmlHelper being removed in 2.0.
2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c
Merge branch '1.3' into integration
...
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
a0a84d1a8d
Changing pattern used to read digest auth data. Allows emails to be used as usernames.
...
This also adds the realm to the return value of SecurityComponent::parseDigestAuth(). Fixes #1181
2010-10-11 22:35:47 -04:00
mark_story
3ab77017ae
Fixing OpenTest license mentions to use MIT License
...
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d
Changing the @license tag on test files, as tests can now be MIT like
...
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
d83c51cde9
Fixing expiration conditions on CSRF tokens.
2010-10-02 18:27:39 -04:00
mark_story
7f7c202f35
Removing old CSRF token validation checks.
...
Removing failing test because the feature moved.
Adding tests for expired and wrong keys.
2010-10-02 17:16:40 -04:00
mark_story
a10f1478ee
Adding support for nonce expiry.
...
Adding simple time based nonce expiration. This does a simple cleanup on
each request, to remove stale tokens. Tests added.
2010-10-02 00:20:58 -04:00
mark_story
711e736cd3
Adding very minimal and incomplete implementation of csrf consumption.
...
Tests added for consuming csrf tokens on each request.
2010-10-01 00:13:34 -04:00
mark_story
dc6b33f80e
Making tokens persist across 'requests'.
...
Removing more serialize/unserialize calls.
2010-09-30 00:26:44 -04:00
mark_story
f5ed91137a
Adding csrfCheck related properties.
...
nonces are now being populated into the session.
2010-09-30 00:18:25 -04:00
mark_story
b088daf045
Adding tests for csrf feature separation.
...
Removing serialize() calls as they didn't really add anything.
2010-09-30 00:06:38 -04:00
mark_story
237b66d193
Adding support for httpOnly cookies to CookieComponent. Fixes #1127
2010-09-25 23:24:37 -04:00
mark_story
2b1bc99eb5
Fixing failing tests in auth and scaffold.
...
Fixing more tests that had stray buffers.
2010-09-25 22:27:31 -04:00
mark_story
92b57d81ee
Moving common setup and teardown functionality in to CakeTestCase.
...
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00
mark_story
5c94bdd028
Fixing failing tests in group context caused by state being stuck in static objects.
2010-09-24 23:30:02 -04:00
mark_story
32dc4aac7b
Fixing usage of mb_internal_encoding so it doesn't bone group tests.
2010-09-24 23:30:02 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4
Removing all uses of the test_suite connection in the test cases
2010-09-24 23:30:01 -04:00
mark_story
973841a264
Fixing issues in tests that caused group test to fail, and removing duplicate environment backup.
2010-09-24 23:30:01 -04:00
mark_story
d64bd2a82c
Making cookie component not send gobs of headers when being tested.
...
Making test case pass in cli.
2010-09-24 23:30:01 -04:00
mark_story
b59033687d
Making private properties and methods protected so they can be manipulated with mocks.
2010-09-24 23:30:00 -04:00
mark_story
c5a47d4daa
Clearing referrer more thoroughly.
2010-09-24 23:30:00 -04:00
mark_story
2385747899
Some more fixes to make tests run better under all tests.
2010-09-24 23:28:49 -04:00
mark_story
c9a6eba000
Fixing scaffold test so all_controllers suite runs in cli.
2010-09-24 23:28:48 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
ADmad
b9a7b27ba1
Fixing regression cased by commit d5ffdc288d
causing ajax layout to be not auto set for ajax request for html pages. Refs #1099
2010-09-21 00:25:17 +05:30
mark_story
e91fa68f8e
Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105
2010-09-18 00:13:03 -04:00
mark_story
f34cfd1f1e
Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference.
...
Removing triggerDisabled key as its no longer needed or wanted.
2010-09-14 23:02:38 -04:00
mark_story
0ef76eb69a
Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor.
2010-09-14 22:52:51 -04:00
mark_story
7a14d3a8f2
Fixing issue where mockObject expectations were not counted hiding fails. Fixing all objects not actually being iterated.
2010-09-14 22:40:46 -04:00
mark_story
8e97a5ee2d
Fixing failing tests caused by missing index in Security component testcase.
2010-09-14 22:20:30 -04:00
mark_story
0baaf6801b
Removing call to RequestHandler as its just a pass through to the request object which is available in that scope. Updating the test cases to not use deprecated and non-existent things.
2010-09-14 22:12:14 -04:00
mark_story
97dd7c7644
Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated.
2010-09-14 21:57:40 -04:00
mark_story
a521291afd
Adding a __set() method to make some tests pass.
...
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
2010-09-13 23:11:59 -04:00
mark_story
84565151de
Removing all the deprecated properties from Controller.
...
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
2010-09-13 23:11:59 -04:00
mark_story
730e373afe
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -04:00
mark_story
85ccd1f096
Fixing skipIf calls so email test runs in a reasonable time frame when there is no local smtp server.
2010-09-12 13:06:49 -04:00
mark_story
e9d194822d
Adding more tests for SMTP address formatting. Fixes #1100
2010-09-12 11:48:09 -04:00
mark_story
e4d34b640b
Merge branch '2.0-exceptions' into 2.0
...
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
2010-09-10 20:31:16 -04:00
mark_story
4a0e34a0d6
Applying patch from 'jeremyharris' to make RequestHandler::renderAs() accept an array of options that can be used to send a file as a download. Fixes #950
2010-09-09 21:31:34 -04:00
mark_story
5d703c4f50
Fixing + adding imports for Scaffold.
2010-09-08 00:11:37 -04:00
Mark Story
d88da3d579
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
dbdd17f51a
Adding test cases from 'euromark' and updating how email addresses are parsed so they are slightly more conformant to RFC 5322. Fixes #1066
2010-09-02 11:16:10 -04:00
predominant
c1209a1a7a
Added RequestObject output in place of Controller:$output whicch no longer exists.
2010-08-28 15:15:23 +10:00
predominant
93b80042f8
Fix failing scaffold tests.
2010-08-28 15:01:43 +10:00
mark_story
dcb7a167b4
Fixing controller test cases.
2010-08-28 00:29:50 -04:00
mark_story
9485f0a993
Merge branch 'request-response' into 2.0
...
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
2010-08-28 00:24:07 -04:00
mark_story
2cdb10812d
Merge branch '2.0-exceptions' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/tests/cases/dispatcher.test.php
2010-08-28 00:14:34 -04:00
José Lorenzo Rodríguez
f63b093d24
Merge branch '2.0-request' into 2.0
...
Still tons of tests failing
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/html.php
cake/libs/view/view.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/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helper.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/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
2010-08-27 23:31:41 -04:30
mark_story
f0d938c1cb
Fixing failing tests in scaffold.
2010-08-27 23:59:29 -04:00
mark_story
7221f9c3b9
Moving response construction into Controller, this will let controller classes more easily modify the response subclass they want to use.
...
Test case updated.
2010-08-22 12:31:55 -04:00
mark_story
f46241a6e7
Merge branch '2.0' into 2.0-helpers
2010-08-16 23:02:44 -04:00
mark_story
705e90bef7
Merge branch '1.3' into 2.0-merge
...
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
36e585bb23
Starting to update a test that was previously marked incomplete.
2010-08-11 23:08:46 -04:00
mark_story
238c734f70
Moving a test case that should be implemented in controller, as that is where the code that needs to be tested is located.
2010-08-11 22:47:54 -04:00
mark_story
62d646d168
Removing tests that have been implemented elsewhere.
2010-08-10 23:56:39 -04:00
mark_story
4463ff7476
Moving all components suite.
2010-08-10 23:34:20 -04:00
mark_story
fdfe8060c6
Adding collection tests to test suites.
2010-08-10 23:18:42 -04:00
mark_story
59c692dbae
Fixing incorrect/failing test in Security component.
2010-08-10 23:18:42 -04:00
mark_story
f5bebc9306
Adding an Acl property to AuthComponent and updating tests to use new API's
2010-08-10 23:18:42 -04:00
mark_story
db1acb461a
Making SessionComponent extend Component. Updating test case.
2010-08-10 23:18:42 -04:00
mark_story
d01708b1ef
Adding temporary $View property to controller until I figure out a better way to provide access for it. Test case updated to reflect View not being in the registry anymore.
2010-08-10 23:18:42 -04:00
mark_story
55d71dc4b5
Updating Controller test case to use new ComponentCollection.
2010-08-10 23:18:40 -04:00
mark_story
ca65faef36
Starting to fix SecurityComponent test case. SessionComponent still causing lots of trouble.
2010-08-10 23:18:40 -04:00
mark_story
fa8a43f038
Updating tests to use new Component api. There are still a pile of tests failing because of SessionComponent.
2010-08-10 23:18:40 -04:00
mark_story
7b4916e16a
Updating AclComponent to new Component API.
2010-08-10 23:18:40 -04:00
mark_story
efc5054b65
Updating CookieComponent Test case to new Component api.
2010-08-10 23:18:40 -04:00
mark_story
22fbc24560
Adding 'collectReturn' option to ObjectCollection::trigger. lets a callback collect the return of each object and return that.
...
Adding tests.
2010-08-10 23:18:40 -04:00
mark_story
bf75ab5737
Starting to update Component into a base class instead of a loader class.
2010-08-10 23:18:39 -04:00
mark_story
3666643b84
Adding ComponentCollection and a test case.
2010-08-10 23:18:39 -04:00
José Lorenzo Rodríguez
e7c7008781
Changing behavior of RequestHandlerComponent::responseType(), it will return the current content type set int the response object
...
It will not return null as default as it did prior 2.0
2010-08-02 19:21:52 -04:30
José Lorenzo Rodríguez
5fb320f31d
Refactoring RequestHandler methods to use the response object
2010-08-02 19:10:01 -04:30
José Lorenzo Rodríguez
4fd032bc10
Refactoring RequestHandlerComponent::mapType() and added response object property to the component
2010-08-02 19:07:26 -04:30
mark_story
3099a15f17
Removing old check for view == 'Theme'. This allows Scaffold to work well with Themed controllers. Test case added. Fixes #255
2010-08-01 22:25:29 -04:00
José Lorenzo Rodríguez
0824348db1
Removing Controller::output property and refactoring methods to not use it. CakeResponse::body() should be used instead
2010-08-01 01:13:41 -04:30
José Lorenzo Rodríguez
9d104fee73
Refactoring Controller::redirect() to use the CakeResponse object
2010-08-01 00:10:46 -04:30
José Lorenzo Rodríguez
3ab4e09e11
Moving Controller::httpCodes() to CakeResponse
2010-08-01 00:09:09 -04:30
José Lorenzo Rodríguez Urdaneta
4c71dd845e
Merge remote branch 'origin/2.0' into 2.0-request
...
Conflicts:
cake/libs/controller/components/auth.php
cake/tests/cases/libs/controller/components/auth.test.php
2010-07-27 22:02:08 -04:30
mark_story
977ffa96be
Removing dead properties and methods from SessionComponent.
...
Sessions should be started as soon as the component is constructed. So there is no reason to have an active()/activate() method.
2010-07-27 22:27:43 -04:00
mark_story
18b6668a34
Moving tests from SessionComponent to CakeSession, as that is where the features actually are. Removing Security.level/Security::inactiveMins() calculations.
2010-07-27 22:27:42 -04:00
mark_story
4b65ebd64f
Making SessionComponent mostly a wrapper for CakeSession.
...
Adding CakeSession::begin() to replace SessionComponent::__start().
Tests updated. Tests related to autoStart were removed/skipped as that feature isn't really around right now.
2010-07-27 22:27:11 -04:00
mark_story
d38857095a
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
mark_story
572f79be67
Fixing failing tests caused by strtolower() in AuthComponent.
2010-07-20 23:44:25 -04:00
mark_story
0c312e3d77
Adding some destroy() calls to cause the timestamps to refresh.
2010-07-18 22:56:57 -04:00
predominant
ca1c8f1f80
Remvoed session destruction from tests.
2010-07-19 12:14:44 +10:00
mark_story
a78bb20bda
Fixing failing test in ControllerTest caused by ThemeView not being correctly found if it was not in the mapped files.
2010-07-18 21:28:52 -04:00
mark_story
41997b06e1
Fixing issues where mb_internal_encoding() might not be correctly set, causing email subjects to be incorrectly encoded. Tests added. Fixes #904
2010-07-18 20:48:15 -04:00
mark_story
0e184c66f4
Adding failing test for #917
2010-07-15 21:52:24 -04:00
mark_story
c9079c8048
Removing magical un-removable plugin concatenation in Controller::loadModel(). Adding test case from 'real34'. Fixes #858
2010-07-13 20:19:31 -04:00
mark_story
5d2c48fd9c
Fixing failing tests caused by strtolower() in AuthComponent.
2010-07-10 12:00:09 -04:00
mark_story
a8e5e587c6
Making RequestHandler able to use the accept header to detect and switch layout/view paths. Fixes #729
2010-07-01 12:01:46 -04:00
mark_story
427e859b52
Refactoring how prefers() works. Tests updated.
...
Removing support for array args in setContent().
2010-07-01 00:46:28 -04:00
mark_story
8d32ad2821
Starting to update RequestHandler methods to use CakeRequest. RequestHandler will provide alias/mapped access to features in CakeRequest. Tests updated and expanded.
2010-07-01 00:13:13 -04:00
mark_story
bb5eab5180
Fixing missed tests in RequestHandler test case.
2010-06-30 23:37:54 -04:00
mark_story
8b847cffef
Merge branch '2.0' into 2.0-request
...
Conflicts:
cake/libs/view/helper.php
cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:54:28 -04:00
mark_story
9e3a41e013
Fixing failing tests.
2010-06-30 22:51:42 -04:00
mark_story
8581350d24
Fixing failing tests.
2010-06-30 22:51:21 -04:00
mark_story
2020675078
Merge branch '1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
991d035806
Fixing respondAs() so it can be called multiple times. Test cases added for respondAs. Fixes #842
2010-06-30 22:34:33 -04:00
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
4b93e61ed3
Adding cookieLifeTime var declaration as it was omitted.
...
Updating session timeout values so they reflect their values in the past.
Making cookieLifeTime configurable in the medium/low security levels.
Fixing Config.timeout setting to go back to 10.
Fixes #798
2010-06-27 12:52:18 -04:00
mark_story
c119ec4d23
Merging in changes from Voidet to correct session times. Minutes were
...
being used instead of seconds, for a value that expected seconds.
Conflicts:
cake/libs/cake_session.php
cake/tests/cases/libs/controller/components/session.test.php
2010-06-27 12:17:37 -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