Commit graph

349 commits

Author SHA1 Message Date
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
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
mark_story
10be0e5c6b Updating ModelTaskTest so it runs in a TestSuite. 2010-07-10 00:22:14 -04:00
mark_story
ec84f57fc1 Updating ControllerTaskTest so it runs in a TestSuite context. 2010-07-10 00:19:32 -04:00
mark_story
e64a1873f9 Marking problem test cases, as things that might need to be skipped or fixed. 2010-07-08 23:53:11 -04:00
mark_story
b15948c3bc Updating merged tests from 1.3 2010-07-08 23:44:41 -04:00
mark_story
fbc84cb89b Switching assertTrue() for assertContains, as its more readable. 2010-07-08 23:38:11 -04:00
mark_story
a3bf367929 Adding unique fixtures to ControllerTaskTest and updating the test cases. 2010-07-08 23:25:39 -04:00
mark_story
82ae533f2a Updating FixtureTest to account for removal of ?> in templates. 2010-07-08 22:40:03 -04:00
José Lorenzo Rodríguez Urdaneta
38d8e03363 Fixing some errors on SchemaShellTest 2010-07-07 23:14:12 -04:30
José Lorenzo Rodríguez Urdaneta
da9d1c6b06 Importing controller in bake test to make it pass under the cli runner 2010-07-07 23:07:23 -04:30
José Lorenzo Rodríguez Urdaneta
7b51feb89c Fixing constant declaration as it was not consistent in web runner and cli runner 2010-07-07 22:58:48 -04:30
José Lorenzo Rodríguez Urdaneta
fa8db5787d Fixing test case 2010-07-07 22:29:26 -04:30
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
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
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
mark_story
d8ac21baae Migrating bake group to PHPUnit. 2010-06-22 23:11:58 -04:00
mark_story
9ace0100ab Updating ExtractTaskTest to pass under PHPUnit. 2010-06-20 23:23:56 -04:00
mark_story
aee1c5483b Renaming test case classes to better reflect the filenames. 2010-06-13 10:06:00 -04:00
mark_story
69559958a7 Adding ommitted new line. 2010-06-12 17:43:12 -04:00
mark_story
9cdf11a02a Updating ModelTask test case to PHPUnit. 2010-06-12 17:42:53 -04:00
mark_story
ad8d5fa29b Updating some tests to use onConsecutiveCalls() as its easier to read and maintain. 2010-06-12 16:10:16 -04:00
mark_story
5013ec03f1 Updating ViewTask test case to PHPUnit. 2010-06-12 15:03:00 -04:00
mark_story
aa8d909764 Updating ProjectTask test case to PHPUnit. 2010-06-10 00:59:19 -04:00
mark_story
a91e8b870a Updating FixtureTask test case to use PHPUnit. 2010-06-10 00:25:23 -04:00
mark_story
98a3239141 Updating TestTask test case to use PHPUnit. 2010-06-09 20:15:37 -04:00
mark_story
574e1e7200 Updating PluginTask test case to use PHPUnit. 2010-06-09 18:11:21 -04:00
mark_story
f09a5bd953 Updating TemplateTask test cases to use PHPUnit. 2010-06-09 00:22:31 -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
ebfbbfea48 Partially fixing DbConfig tests to work with phpunit. 2010-06-08 00:54:42 -04:00
mark_story
94fc492623 Correcting how ExtractTask collects files. Test added. Fixes #775 2010-06-06 22:39:04 -04:00
predominant
e47c9660f9 Remove debugging. 2010-06-07 02:03:41 +10:00
predominant
d803b30388 Fix Model validation bake tests for Windows. 2010-06-07 01:39:24 +10: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
5ef9103a52 Updating the rest of the controller task test case to use phpunit. 2010-05-30 00:59:36 -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
mark_story
62ec25857f Making more tests work in phpunit. 2010-05-30 00:07:43 -04:00
mark_story
0dc627178a updating helper and component tests for controller task to use phpunit. 2010-05-26 23:01:14 -04: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
9647e359c4 First test passing for controllertask test 2010-05-25 23:54:28 -04:00
mark_story
08bcf55b8d Starting to convert controller task test to phpunit. 2010-05-25 23:51:48 -04:00
mark_story
66699df9a0 Updating Shell.test to use PHPUnit. There may still be some errors with the windows tests as I don't have access to windows at this time. 2010-05-23 14:52:46 -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
81c2169b0b Fixing BakeShell test for PHPUnit. Mock expectation numbers are off due to some oddities in PHPUnit. 2010-05-22 22:40:18 -04:00
mark_story
0436e938cd Fixing typo in class name. 2010-05-22 22:39:46 -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
mark_story
1955b0fb1f Updating Acl cli tool test case to use PHPUnit mock objects. 2010-05-22 20:21:27 -04:00
mark_story
1c36c1f088 Updating ShellDispatcher test case to use PHPUnit mock objects. 2010-05-22 13:10:01 -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