Commit graph

489 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
aa18cca1c3 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
Jeremy Harris
e99f090ee0 Fixed issue where ClassRegistry alias was incorrectly set 2011-01-27 18:32:51 -08:00
José Lorenzo Rodríguez
d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
Jeremy Harris
c970770c8d Merge remote branch 'upstream/2.0' into 2.0 2011-01-21 15:09:06 -08:00
Jeremy Harris
68799c9828 Removed unnecessary imports and ensured model import. Fixes #1453 2011-01-21 15:08:37 -08:00
Juan Basso
646bb936bf Checking test to avoid fatal error when the test case dont have test actions. 2011-01-21 13:34:34 -02:00
Juan Basso
40bdcbb44a Removing $name from controller, model and fixtures. 2011-01-19 21:15:33 -02:00
Jeremy Harris
c7127630f6 Added support for plugin classes in ControllerTestCase::generate(). Fixes #1453 2011-01-18 17:50:34 -08:00
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
e20ea8ad72 Renaming Dispatcher::__loadRoutes -> Dispatcher::_loadRoutes to match naming conventions.
Updating method name usage, as assertType is deprecated as of PHPUnit 3.5.6
2010-12-24 12:54:04 -05:00
José Lorenzo Rodríguez
22581516db Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/tests/cases/libs/controller/component.test.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
	lib/Cake/tests/cases/libs/controller/pages_controller.test.php
2010-12-18 00:04:44 -04:30
mark_story
862a2bc25e Removing duplicate class definition that could cause test suite inconsistencies.
Adding skip for when AppController is defined.
Changing how mock models are constructed to better use Model::__construct parameters.
2010-12-15 23:33:00 -05:00
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
Jeremy Harris
b9143dc7d4 Added ControllerTestCase class for testing controllers. Fixes #1244 2010-12-14 19:58:27 -08:00
mark_story
b9f0fc0724 Merge branch '1.3' into merger
Conflicts:
	cake/dispatcher.php
	cake/libs/cake_session.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/set.php
	cake/libs/validation.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
José Lorenzo Rodríguez
4c9ad2dec8 Starting the tedious process of moving the testsuite and tests 2010-12-08 00:34:45 -04:30
mark_story
8681399fc2 Forcing the plugin list to use a fresh directory listing in the web runner. Fixes #1338 2010-12-06 21:29:11 -05:00
José Lorenzo Rodríguez
c559b9c22d Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/console/templates/skel/config/database.php.default
	cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
José Lorenzo Rodríguez
2e9283abd9 Fixing fixture loading for sqlite 2010-11-29 20:52:54 -04:30
José Lorenzo Rodríguez
c0f10437ea Adding a few transactions to speed up a little tests involving fixtures 2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
f2b707ac0b Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
2010-11-16 21:54:42 -04:30
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
Mariano Iglesias
a1467822fb Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout 2010-11-10 23:03:38 -04:30
José Lorenzo Rodríguez
f93a759220 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-08 21:30:38 -04:30
mark_story
5214c56f1b More instructions on how to install phpunit. 2010-11-07 18:02:19 -05:00
mark_story
b8cc605e21 Updating instructions for installing phpunit. 2010-11-07 18:00:22 -05:00
José Lorenzo Rodríguez
eedd823fd8 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-03 00:23:18 -04:30
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
José Lorenzo Rodríguez
2eb0392b8a Removing forced trucation of tables in fixture loading, it was not really needed 2010-10-25 19:47:53 -04:30
José Lorenzo Rodríguez
1acb619e75 Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC 2010-10-24 19:59:54 -04:30
Graham Weldon
d3e0ddbb0e Update copyright years. 2010-10-25 07:58:22 +11:00
Juan Basso
deb20d4cf2 Fixed the PHPDoc. 2010-10-21 14:56:05 -02:00
Toni Uebernickel
b04f87f62d fixed E_NOTICE undefined variable in CakeCliReporter::paintException 2010-10-21 14:56:04 -02:00
mark_story
3ab77017ae Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d Changing the @license tag on test files, as tests can now be MIT like
the rest of CakePHP.
2010-10-03 12:27:27 -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
c3ccf15546 Replacing the use of removed "sharedFixture" and adding custom "fixtureManager" property to CakeTestCase 2010-09-27 23:37:56 -04:30
José Lorenzo Rodríguez
0eaf437fe4 Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade 2010-09-27 23:19:47 -04:30
José Lorenzo Rodríguez
2635733aba Merge branch '2.0' into 2.0-phpunit-upgrade 2010-09-27 22:42:10 -04:30
José Lorenzo Rodríguez
ba168d1a72 Initial steps towards migrating to phpunit 3.5 2010-09-27 22:37:23 -04:30
mark_story
63d23df77a Merge branch 'setup-teardown' into all-tests 2010-09-25 22:34:20 -04:00
José Lorenzo Rodríguez
18b38f61e0 Fixing CakeTestFixture import feature 2010-09-25 21:53:48 -04:30
mark_story
92b57d81ee Moving common setup and teardown functionality in to CakeTestCase.
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00
José Lorenzo Rodríguez
5538529c41 Fixing some issues with tables that were not beign droppend at the end of test suite execution 2010-09-25 19:15:26 -04:30
mark_story
26057c59c4 Fixing issue in DboSource test case where buffer would eat all the output.
Removing dead tests from TestManager test.
2010-09-25 01:13:01 -04:00
mark_story
d7b5e12b85 Removing methods from TestManager and putting them into CakeTestSuite. 2010-09-25 00:16:28 -04:00
mark_story
d7b958f55d Starting to move test suite manipulation methods into CakeTestSuite. 2010-09-25 00:00:08 -04:00
mark_story
460a8bc4f6 test_suite suite now runs. Still has a few failing tests from the fixture test case. 2010-09-24 23:30:02 -04:00