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
..
tasks	Merge branch '2.0' into 2.0-phpunit	2010-05-30 22:13:09 -04:00
acl.test.php	Updating Acl cli tool test case to use PHPUnit mock objects.	2010-05-22 20:21:27 -04:00
api.test.php	Fixing typo in class name.	2010-05-22 22:39:46 -04:00
bake.test.php	Fixing BakeShell test for PHPUnit. Mock expectation numbers are off due to some oddities in PHPUnit.	2010-05-22 22:40:18 -04:00
schema.test.php	Moving test to work with PHPUnit.	2010-05-23 00:17:22 -04:00
shell.test.php	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