Commit graph

849 commits

Author SHA1 Message Date
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
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
José Lorenzo Rodríguez
9d35ea0cbc Upgrading CodeCoverage repoting fo phpunit 3.5 2010-09-29 01:14:14 -04:30
José Lorenzo Rodríguez
45a407783e Updating options help 2010-09-28 21:11:43 -04:30
mark_story
500550faef Adding documentation note about AclShell and issues with zend.ze1_compatibilty. Fixes #987 2010-09-26 12:33:15 -04:00
mark_story
94d738e834 Fixing failing tests and group test situational fails in console tests. Adding console tests to all tests. 2010-09-24 23:30:02 -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
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
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
6e5e32bef5 Updating AclShell test to use AclComponent correctly. 2010-09-07 23:40:07 -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
5c0fe1b16e Applying patch from 'majna'. Adding plugin to the list of template variables exposed in the controller task. Test added Fixes #1077 2010-09-03 12:33:59 -04:00
mark_story
dc67b9cacc Moving all the exceptions into one file for the short term. 2010-08-28 00:08:35 -04:00
mark_story
c48c0d6295 Fixing issue where ViewTask would make empty view files for actions that did not have templates. Test case added. Fixes #1040 2010-08-23 21:49:30 -04:00
mark_story
e0acd2131f Fixing ShellDispatcher tests and making ShellDispatcher/Shell use TaskCollection to loadTasks. 2010-08-10 23:18:41 -04:00
mark_story
9804ed0cb3 Adding tests for loading plugin files. 2010-08-10 23:18:41 -04:00
mark_story
457f24d882 Adding TaskCollection, much like Helper and Component collection TaskCollection will be used to reduce global space pollution. 2010-08-10 23:18:41 -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
b5d7f6447f Applying patch from 'asavoy'. Changing schema shell so that schema files generated for plugins have the classname of PluginSchema instead of AppSchema. Tests updated. Fixes #922 2010-07-23 21:46:06 -04:00
Scott Reeves
1774530222 Fixing typo in method description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:28 -04:00
José Lorenzo Rodríguez Urdaneta
478cbd0a60 Adding test case for TestSuiteShell and refactoring to ease this testing 2010-07-13 21:28:21 -04:30
José Lorenzo Rodríguez Urdaneta
1c08d48652 Showing the available testcases when the testsuite shell is run with no params 2010-07-13 20:23:45 -04:30
José Lorenzo Rodríguez Urdaneta
ab6e3eecd9 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts:
	cake/console/libs/testsuite.php
2010-07-13 20:22:40 -04:30
José Lorenzo Rodríguez Urdaneta
7f7de13905 Improving the help screen in the testsuite shell 2010-07-13 20:20:19 -04:30
mark_story
fb3c3a6413 Removing non functional -coverage option from the help
Removing now dead code.
Adding support for documented -filter option.
2010-07-13 20:15:25 -04:00
José Lorenzo Rodríguez Urdaneta
01cfe32667 Adding a test case list to the test suite cli runner 2010-07-12 23:24:59 -04:30
José Lorenzo Rodríguez
1b97af2e34 Making necessary changes to use the PHPUnit cli tool in testsuite shell 2010-07-07 00:11:06 -04:30
José Lorenzo Rodríguez
21ffdb0ab9 Starting to refactor testsuite shell to use the PHPUnit Cli runner 2010-07-07 00:07:22 -04:30
mark_story
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -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
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
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
9ace0100ab Updating ExtractTaskTest to pass under PHPUnit. 2010-06-20 23:23:56 -04:00
mark_story
dad4b5ae5c Updating DbConfigTask to PHPUnit.
Making protected methods and properties protected for easier mocking.
2010-06-08 22:14:48 -04:00
mark_story
94fc492623 Correcting how ExtractTask collects files. Test added. Fixes #775 2010-06-06 22:39:04 -04:00
mark_story
8d8fce4429 Fixing template task path replacements under windows. Fixes #771 2010-05-31 21:26:55 -04:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
Mark Story
ca5fb9fb93 Fixing tests broken by changes in default bake templates.
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-30 00:11:37 -04:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
mark_story
8ac46c3b63 Adding return from _stop() to help testing.
Updating tests for getName()
2010-05-26 21:59:56 -04:00
mark_story
265609dfc1 Moving test to work with PHPUnit.
Fixing incorrect count amount in SchemaShell.
2010-05-23 00:17:22 -04:00
mark_story
89a8ef3871 Updating API shell to use reflection as the regular expression was not working with visibility keywords.
Updating tests for changes in output.
Updating tests to work with PHPUnit.
2010-05-22 22:09:07 -04: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
cd5aee1bfa Applying patch from 'franiglesias'. Fixes issues where str_replace would greedily replace too many occurences of 'libs/'. Fixes #724 2010-05-16 23:50:17 -04:00
Mark Story
96d0119abc Applying patches from 'wals' to fix uses where incorrect parameters were being passed into methods, and making methods match their documentation blocks. Fixes #668 2010-05-10 23:58:22 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00