Commit graph

563 commits

Author SHA1 Message Date
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