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
ef6e01f21f
Making themePath work with E_STRICT.
2010-06-30 22:48:30 -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
e18e0cc64e
Removing blank line.
2010-06-30 20:52:58 -04:00
mark_story
dc72529648
Implementing assettimestamps for themes and plugins. Tests added. Fixes #804 , #879
2010-06-30 20:47:54 -04:00
mark_story
8b9d9b1b12
Removing literal '/' for DS which works better under windows.
2010-06-30 20:37:09 -04:00
mark_story
16cae72417
Using App::themePath inside Dispatcher.
2010-06-30 20:23:04 -04:00
mark_story
91f8e220e4
Adding App::themePath(). Will be used to reduce code duplication in a variety of places.
2010-06-30 20:17:17 -04:00
mark_story
e023350af5
Updating API docs related to DboSource::$cacheMethods. Fixes #870
2010-06-30 08:52:39 -04:00
mark_story
735ac17b85
Updating documentation on App::objects() so it more reflects what the method does. Fixes #874
2010-06-30 08:45:06 -04:00
mark_story
dedc85390c
Adding header() to get header/server vars.
...
Adding OPTIONS to the detector list.
2010-06-29 00:24:29 -04:00
mark_story
3e6cd0be44
Removing inheritance on Object as Dispatcher has no use for the inherited methods.
...
Removing flush() call as it was causing the test suite to not display anything.
2010-06-29 00:13:24 -04:00
mark_story
ea322b8f78
Fixing issue where getCrumbList() was overwriting attributes.
2010-06-28 23:45:36 -04:00
mark_story
dae14ac72b
Removing debug.
2010-06-28 23:44:36 -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
a84db71895
Fixing comments in file.
2010-06-28 23:01:25 -04:00
mark_story
d7ff6cf244
Updating simpletest error page to reflect PHPUnit.
2010-06-28 22:59:01 -04:00
mark_story
1c47702cb9
Updating formatting to match coding standards.
2010-06-28 22:53:33 -04:00
mark_story
5e79a450b8
Removing some more grouptest artifacts.
2010-06-28 22:44:13 -04:00
mark_story
ec04c4f7aa
Removing CLI reporter. Its no longer used.
2010-06-28 22:42:52 -04:00
Leszek Stachowski
68a9c9c5ab
Added HtmlHelper::getCrumbList() to generate semantically correct
...
(x)html breadcrumb navigation path and a test to it. Fixes #856
Signed-off-by: mark_story <mark@mark-story.com>
2010-06-28 22:36:28 -04:00
mark_story
cb3100f71f
Applying patch from 'tbhot3ww' to make Dispatcher::asset() more forgiving with whitespace. Fixes #864
2010-06-28 22:35:07 -04:00
mark_story
8f25547fc1
Applying patch from 'tbhot3ww' to make Dispatcher::asset() more forgiving with whitespace. Fixes #864
2010-06-28 22:34:47 -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
94965f0f6c
Adding an additional test for View::entity().
...
Fixing issue where nulls would be shifted onto the entity array causing incorrect name attributes. Fixes #867
2010-06-28 21:38:17 -04:00
mark_story
f11f9ebc68
Adding test case for #867 .
2010-06-28 21:32:49 -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
16b7d3b156
Fixing assertIdentical wrapper as assertIdentical used to type check, much like assertSame does.
2010-06-27 22:48:30 -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
35d232f08f
Updating documentation in app/core.php to match historical values.
...
Updating skel/core.php to reflect current core.php.
2010-06-27 12:50:03 -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
b9383f13dc
Adding some additional documentation for FormHelper::inputs().
2010-06-27 00:39:31 -04:00
mark_story
139c377e09
Updating help for testsuite shell.
...
Updating testsuite shell interface so it takes fewer arguments.
Making -coverage an option instead of a positional argument.
2010-06-26 14:20:34 -04:00
mark_story
e9ba86b9e6
Fixing typo and implementing -filter in testsuite shell. Fixes #211
2010-06-26 14:07:38 -04:00
mark_story
bd43866f5b
Removing commented code and code never used anymore.
2010-06-26 13:58:49 -04:00
mark_story
b4c061b477
Testsuiteshell now runs again with PHPUnit tests.
2010-06-26 13:49:21 -04:00
mark_story
bbf5a051e0
Making CakeTextReporter work a little nicer in a CLI context.
...
Updating documentation on TestManager.
2010-06-26 13:48:55 -04:00
mark_story
0baab93929
Doing some tweaks to CakeTestSuiteDispatcher to make CLI testing easier.
2010-06-26 13:48:11 -04:00
mark_story
3ebbaf106c
Removing SimpleTest method calls.
2010-06-26 13:47:30 -04:00
mark_story
f81497070d
Fixing compatibility issues in CakeTextReporter that have come up.
2010-06-26 13:02:35 -04:00
mark_story
206d4d4722
Removing 'group tests' PHPUnit implements them as testsuites, which do not need to be handled differently than test cases.
2010-06-26 12:58:03 -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
mark_story
a166ea78cb
Fixing fails in dbo source test caused by not enough fixtures being loaded.
2010-06-25 23:40:29 -04:00
mark_story
c084456a08
Moving console and database groups to PHPUnit.
...
Both have some fails caused by the current fixture implementation.
Removing groups folder as its no longer used.
2010-06-25 23:36:08 -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
0fb9a9c481
Porting Behavior group to PHPUnit. Containable is commented out because its test crashes the group.
2010-06-24 23:59:06 -04:00
