Commit graph

249 commits

Author SHA1 Message Date
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
309d08d4ef Mocking out clear() on all the shell tests as it wreaks havoc on the CLI runner. 2010-09-24 23:30:02 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4 Removing all uses of the test_suite connection in the test cases 2010-09-24 23:30:01 -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
fbd0741a83 Making a test more resilient when additional fixtures are loaded. 2010-09-09 22:54:22 -04:00
mark_story
f677c4ab44 Fixing bake task tests and adding ConsoleErrorHandler to the AllShells suite. 2010-09-07 23:51:39 -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
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
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
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
9ace0100ab Updating ExtractTaskTest to pass under PHPUnit. 2010-06-20 23:23:56 -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
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
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
45d052b55a Fixing failing tests in ViewTask test case, caused by changes in core templates.
Fixing incorrect variable usage where models would be double singularized causing incorrect names.  Fixes #668
2010-05-06 21:38:14 -04:00
Mark Story
fcad9b464c Fixing tests broken by changes in default bake templates.
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-04 23:27:41 -04:00
Mark Story
0a8aafe3c8 Fixing reference to method name. 2010-04-23 22:03:11 -04:00
predominant
74d7682707 Fix translation shortcut usage through testing console for updates 2010-04-16 02:38:12 +10:00