mark_story
122dc65427
Merge branch 'merger' into 2.0
2011-01-08 23:51:03 -05:00
mark_story
443f6d1c5b
Merge branch '1.3' into merger
...
Conflicts:
cake/console/shells/tasks/test.php
cake/libs/cake_log.php
cake/libs/controller/components/email.php
cake/libs/set.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/time.php
cake/libs/view/view.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/shells/tasks/test.test.php
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
AD7six
e024b6b43b
only check the default template path is correct
...
this prevents a misleading error if you've more than one bake template installed
2011-01-08 14:08:28 +01:00
mark_story
8754d11aed
Adding EmailComponent::_getSocket() so EmailComponent + smtp is easier to test.
...
Fixing issue where hosts with portnames could cause smtp emails to fail.
Added tests, fixed an existing test to not depend on a local mailserver.
Fixes #1433
2011-01-06 23:10:01 -05:00
mark_story
6e2ffafe54
Fixing Set::filter() not predictably filtering in a recursive fashion. While a minor change in behavior, more predictable and uniform behavior is worth it.
...
Fixes #1431
2011-01-05 22:48:09 -05:00
Jeremy Harris
37b98ff1a6
Merge remote branch 'upstream/2.0' into 2.0
2011-01-05 19:07:25 -08:00
Jeremy Harris
a8ac288d1c
Added $format option to TimeHelper::nice(). Fixes #433 , #638 , #291 , #801
2011-01-05 19:06:52 -08:00
mark_story
de6eda964e
Removing silent errors in PDO dbo's when a connection exception is created.
...
Adding the host param for mysql.
Adding a test for mysql missing the host param.
Fixes #1427
2011-01-03 23:34:22 -05:00
mark_story
d3d009588d
Fixing failing tests because of incorrect types.
2011-01-03 23:06:48 -05:00
Jeremy Harris
4d2fdcd15e
Added support for using plugin syntax in App::objects(). Fixes #1366
2011-01-03 19:27:21 -08:00
mark_story
c58f835d9b
Fixing tests that were passing by accident. The mockObjects array wasn't being appended to so tests were passing when they shouldn't have.
...
Fixing more failing tests.
2011-01-03 16:07:49 -05:00
mark_story
09d357cc43
Removing empty fixtures array.
2011-01-02 22:33:49 -05:00
Jeremy Harris
733f4f395e
Reordered PaginatorHelper::sort() key and title to be more consistent.
...
Fixes #1000
2011-01-02 18:44:41 -05:00
José Lorenzo Rodríguez
da152e0e82
Changes to make mysql cast boolean vaules to the native php boolean datatype
2011-01-01 22:07:27 -04:30
mark_story
1f6fba9d9e
Fixing failing test caused by missing space.
2010-12-31 16:36:14 -05:00
mark_story
5768bfe5c7
Fixing failing test caused by missing space.
2010-12-31 16:35:44 -05:00
mark_story
a7061510c1
Applying patch from 'rynop'. Fixing FixtureTask so it includes the datasource if its not the default one.
...
Updating tests.
Fixes #1419
2010-12-31 13:05:04 -05:00
mark_story
eb38b8b60c
Fixing more boundary issues with first() and last(). When you entered a first/last range a wonky page link would be generated. Tests added.
2010-12-27 23:40:10 -05:00
mark_story
5092013304
Making EmailComponent register and un-register its view object, when rendering email templates. This allows helpers to use the view to do additional processing. Fixes #442
2010-12-27 15:12:27 -05:00
mark_story
e003bd6ea9
Adding rel attributes for first and last links. These attribute values are part of the html5 spec, and fit with the intention of #370
2010-12-27 10:48:38 -05:00
mark_story
af608f68ef
Updating test cases for the addition of rel attributes to links generated by PaginatorHelper. Also removed rel attributes for disabled elements, as they are probably not link tags. Fixes #370
2010-12-27 10:38:30 -05:00
mark_story
5ce66d3031
Changing how PaginatorComponent::paginate()'s $whitelist param works. It now serves as the whitelist for fields ordering can be done on. It previously allowed you to whitelist things you passed into paginate(), which was kind of useless.
...
Updated tests.
Fixes #430
2010-12-26 21:30:43 -05:00
mark_story
f62a067d7c
Making it possible for behaviors to define paginate and paginateCount. Updated test to ensure the component calls the correct methods.
...
Fixes #1373
2010-12-26 17:40:34 -05:00
mark_story
fd3b4b2cd5
Adding Model::hasMethod() and tests.
2010-12-26 17:35:22 -05:00
mark_story
c5fa93b0fb
Removing test that is testing methods covered in ObjectCollection test case.
2010-12-26 17:26:18 -05:00
mark_story
0c4b665ad0
Adding ability for BehaviorCollection::hasMethod() to return the callback.
...
Re-factored BehaviorCollection::dispatchMethod to be simpler and faster.
Changing now BehaviorCollection stores callbacks so they look like normal php callback arrays.
2010-12-26 17:09:20 -05:00
mark_story
769da1a7c8
Adding basic BehaviorCollection::hasMethod implementation. Tests added.
2010-12-26 16:44:50 -05:00
mark_story
edf567b9f9
Adding convertKeys to PaginatorHelper::options().
...
Added a test case.
Fixes #1390
2010-12-26 13:24:05 -05:00
mark_story
ee3017599d
Merge branch '2.0' into 2.0-pagination
...
Conflicts:
cake/libs/controller/components/paginator.php
cake/libs/router.php
2010-12-24 14:43:11 -05:00
mark_story
ef77e60cb0
Removing @subpackage tags, moving contents of @subpackage into @package.
...
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
e20ea8ad72
Renaming Dispatcher::__loadRoutes -> Dispatcher::_loadRoutes to match naming conventions.
...
Updating method name usage, as assertType is deprecated as of PHPUnit 3.5.6
2010-12-24 12:54:04 -05:00
mark_story
f85567a566
Removing @author tags that snuck in.
2010-12-21 21:58:20 -05:00
mark_story
6f62c22cbc
Fixing fencepost errors.
...
Splitting tests up into smaller groups.
2010-12-20 20:27:27 -05:00
mark_story
abc6a28eca
Increasing code coverage.
2010-12-20 14:02:12 -05:00
mark_story
0b90195a52
Adding tests for creating next/prev links with querystrings.
...
Removing code that doesn't seem to do anything, no tests fail when its removed.
2010-12-20 13:59:09 -05:00
mark_story
d7e411650f
Moving some tests around so its easier to figure out what's being tested.
...
Adding a querystring test.
2010-12-20 13:39:22 -05:00
mark_story
e5588f746c
Reversing changes that required a : sigil for named parameters. Also removing ?foo style parameters for querystring args. Having two ways to create querystring args was not sitting well with me.
...
Tests updated.
2010-12-19 23:11:02 -05:00
mark_story
b49b49a5ef
Removing named parameter sigils.
2010-12-19 22:17:57 -05:00
mark_story
d3fc29c8e8
Adding more documentation to connectNamed().
...
Changing argSeparator -> separator, as it is less typing and easier to remember.
2010-12-19 21:49:17 -05:00
mark_story
4c3736a68a
Making more tests pass with the named parameter changes.
2010-12-19 17:38:21 -05:00
mark_story
51e2b16d46
Removing pagination test from Containable test case, it doesn't make sense there.
2010-12-19 17:24:38 -05:00
mark_story
5df2678ba9
Fixing named params that were missing the : and fixing Router::reverse() so it adds in the :
2010-12-19 17:09:34 -05:00
mark_story
c83a4703a3
Implementing ability to change pagination params to use querystring variables.
...
Tests added.
2010-12-19 16:47:22 -05:00
mark_story
da46ad494b
Deleting duplicate tests.
...
Moving a test out into a separate method.
2010-12-19 13:53:11 -05:00
mark_story
cc2d8e2fec
Moving limit from the options to the normal paging params. This fixes a few notice errors.
2010-12-19 13:15:04 -05:00
mark_story
176d5520f6
Making paging params match those that would be generated by PaginatorComponent.
2010-12-19 13:09:52 -05:00
mark_story
8c3ceff50d
Making paging.options only contain options that are not in the defaults. This replaces the many diffs that were calculated on each url generation between paging.options and paging.defaults.
2010-12-19 12:58:07 -05:00
mark_story
833bdbcc0b
Reformatting paging params.
...
Removing defaults from the paging params as they are no longer being used.
2010-12-19 12:43:29 -05:00
mark_story
e9d3fcf5cf
Moving limit checking into a separate method, and adding tests.
...
Removing $scope from being passed down to the options, it previously only allowed additional conditions to be set.
Updated tests.
2010-12-19 11:58:35 -05:00
mark_story
108a6611a8
Moving validation of sorting to a separate method. This makes it easier to test, extends and read.
...
Tests added.
2010-12-19 02:12:39 -05:00
mark_story
7b11eeb6e0
Updating tests to not use the deprecated Controller::$passedArgs.
...
Removing messy and hard to understand defaults + whitelisting from paginate() now that it has a separate method.
2010-12-19 01:57:51 -05:00
mark_story
6b3db0a3eb
Pulling out parameter merging logic into a method, this allows specific typing of parameter merging (named, querystring, route). Also simplifies whitelisting of request parameters.
...
Tests added for merging and whitelisting.
2010-12-19 01:42:23 -05:00
mark_story
7585b2941e
Adding paramType to the test cases.
2010-12-19 00:38:20 -05:00
mark_story
54c52d85fb
Fixing failing tests in PaginatorComponent.
2010-12-18 17:29:47 -05:00
mark_story
6b9d9f4aea
Reapplying changes in [ 33d2f9a6ed] as they got lost when the paginator component was extracted.
2010-12-18 17:17:43 -05:00
mark_story
7c6af5bfec
Making a test actually test what its supposed to.
2010-12-18 17:01:26 -05:00
mark_story
319e622151
Added another test for querystring params. Querystring params should not be affected by greedy routes, as they are not really controlled by internal routing.
2010-12-18 16:51:54 -05:00
mark_story
eb9fe07472
Adding query string generation into CakeRoute. This removes one more task from Router. Tests added
...
Adding constants for the named param and querystring param sigils.
2010-12-18 16:44:21 -05:00
Juan Basso
5d2b4c758d
Minor optimization in cache views.
2010-12-18 19:41:57 -02:00
Juan Basso
a7c7436d8e
Passing viewVars to cache views, avoiding cake:nocache problems.
2010-12-18 19:31:10 -02:00
mark_story
b1630d4f07
Removing garbage from Paginator test cases.
2010-12-18 15:48:14 -05:00
mark_story
3b0a3d4109
Making route matching fail even faster. This gives significant performance boosts to routes not matching.
2010-12-18 14:36:11 -05:00
mark_story
756b09849f
Router tests all pass now.
2010-12-18 14:26:45 -05:00
mark_story
328db0c36b
Fixed a number of tests, there are still a few issues with prefix routes.
...
Moved removing defaults that are also keys to the compile step. This
removes quite a few repetitive loops.
2010-12-18 14:18:21 -05:00
mark_story
8d404332a2
Fixing issue where named params equal to null/false would be part of the generated url.
2010-12-18 13:40:07 -05:00
mark_story
6ef8203d54
Adding another case that makes false/null to not cause match failure.
2010-12-18 13:32:05 -05:00
mark_story
456a14cf37
Refactored CakeRoute::match() to not use Set::diff(). This was the slowest part of reverse routing and this change should make things faster.
...
Added additional tests for the 0 edge case.
2010-12-18 12:34:48 -05:00
mark_story
c5bab54125
Starting to try and re-factor named params to perform better and be more
...
explicit with how they are used.
2010-12-18 00:15:09 -05:00
mark_story
de7b324444
Fixing more strict warnings.
...
Removing & on component callbacks.
Updating incorrect method signatures.
2010-12-18 00:03:03 -05:00
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
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
mark_story
53a687049c
Fixing encoding of address aliases. They are now mime-encoded like other headers. Tests added. Fixes #1360
2010-12-13 23:23:02 -05:00
Juan Basso
176da15417
Moved the response methods from HttpSocket to HttpResponse.
2010-12-14 02:22:30 -02:00
