Commit graph

3820 commits

Author SHA1 Message Date
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
a166ea78cb Fixing fails in dbo source test caused by not enough fixtures being loaded. 2010-06-25 23:40:29 -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
José Lorenzo Rodríguez Urdaneta
052f64b6cd Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-25 00:04:22 -04:30
José Lorenzo Rodríguez Urdaneta
4689be643b Migrating EmailTest to phpunit 2010-06-25 00:02:20 -04:30
mark_story
0fb9a9c481 Porting Behavior group to PHPUnit. Containable is commented out because its test crashes the group. 2010-06-24 23:59:06 -04:00
mark_story
e2e26696f8 Moving 'group' files to top of the list. 2010-06-24 23:58:57 -04:00
mark_story
7f9f76d012 Migrating Controller group to PHPUnit. 2010-06-24 22:54:15 -04:00
mark_story
b3faa7f23b Fixing skips in ControllerMergeVarsTest. 2010-06-24 22:53:48 -04:00
José Lorenzo Rodríguez Urdaneta
e1bdf57a77 Migrating Test Suite group to phpunit 2010-06-24 10:53:56 -04:30
José Lorenzo Rodríguez Urdaneta
4129ca4f40 Changing classes names to match their filename and make pass the CakeTestCase test 2010-06-24 10:52:43 -04:30
José Lorenzo Rodríguez Urdaneta
bd02a2b2b6 Removing test method for testing inclusion of "test groups", as we're dropping supoort in TestManager to load groups in favor of composing test suites in phpunit 2010-06-24 10:36:16 -04:30
José Lorenzo Rodríguez Urdaneta
10c0494b92 Migrating configure group test to phpunit and fixing docs 2010-06-24 09:38:49 -04:30
José Lorenzo Rodríguez Urdaneta
5d9c0eeab7 Migrating socket group to phpunit 2010-06-24 09:20:19 -04:30
José Lorenzo Rodríguez Urdaneta
2fcaa8d68a Migrating models group to phpunit 2010-06-24 00:53:41 -04:30
José Lorenzo Rodríguez Urdaneta
72c7c3f44e Completing migration of ModelIntegration test case to phpunit 2010-06-24 00:52:43 -04:30
José Lorenzo Rodríguez Urdaneta
1ce18ee11b Migrating CakeTestFixtureTest to phpunit 2010-06-24 00:08:40 -04:30
mark_story
d8ac21baae Migrating bake group to PHPUnit. 2010-06-22 23:11:58 -04:00
mark_story
6109b901d0 Removing Acl group its not really needed, all the classes are parts of other groups. 2010-06-22 23:11:34 -04:00
Juan Basso
9bbaf153f7 Setting cookies in a single line. Fixes #48 2010-06-23 00:10:21 -03:00
mark_story
e9684fb1aa Porting Libs group to PHP Unit. 2010-06-21 22:55:12 -04:00
mark_story
747847e275 Moving restore_error_handler up into TestManager and out of CakeTestSuite. 2010-06-21 22:54:41 -04:00
mark_story
d1a06f3c20 Adding a restore_error_handler() so the Debugger test doesn't interfere with other tests. 2010-06-21 22:54:01 -04:00
mark_story
069c270a3d Calling parent methods from overridden methods. Deleting commented garbage test. 2010-06-21 22:53:30 -04:00
mark_story
22baf7fd45 Fixing fatal errors that would arise if the Exception did not have a parent class. 2010-06-21 22:47:41 -04:00
mark_story
7ac76f3e0b Making Debugger test case play nicely with TestSuites. 2010-06-21 22:39:17 -04:00
mark_story
9df7268080 Changing require for App::import() so tests are more composable. 2010-06-21 22:27:50 -04:00
mark_story
f8ff8596a2 Porting component group to PHPUnit. 2010-06-21 22:08:15 -04:00
mark_story
b85bbd0dcf Porting localization group to phpunit. 2010-06-21 21:56:31 -04:00
mark_story
e60f18e12c Porting Routing test group to PHPUnit. 2010-06-21 21:52:48 -04:00
mark_story
ebd2a67e29 Porting Xml group test to PHPUnit. 2010-06-21 21:50:38 -04:00
mark_story
7bfd5eee9c Fixing comment. 2010-06-21 21:49:52 -04:00
mark_story
d7a44e4e78 Updating @since tag and renaming AllCacheEngines test suite. 2010-06-21 21:48:23 -04:00
mark_story
5945edd983 Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838 2010-06-21 21:17:37 -04:00
mark_story
4a5353e00a Migrating Cache group case to PHPUnit. 2010-06-20 23:46:45 -04:00
Juan Basso
26d20b6d62 Fixing wrap for html mode in e-mails. Fixes #663 2010-06-21 00:37:25 -03:00
mark_story
9ace0100ab Updating ExtractTaskTest to pass under PHPUnit. 2010-06-20 23:23:56 -04:00
mark_story
fad2610c9b Fixing the failing tests in ObjectTest for PHPUnit. Also marking tests as incomplete as there are several issues with Object::persist() and private properties. 2010-06-20 23:14:14 -04:00
Juan Basso
2a4489cdf2 Naming conventions to datasources with plugins. Fixes #819 2010-06-20 23:53:54 -03:00
mark_story
e14d8e5280 Updating test cases to work with JsBaseEngineHelper being abstract. 2010-06-20 22:31:24 -04:00
mark_story
2db510d1c1 Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832 2010-06-20 21:47:34 -04:00
mark_story
268b269eaa Updating file headers on test cases. Changing license on test cases to match the rest of the framework as the tests no longer interact with GPL code. 2010-06-13 10:14:28 -04:00
mark_story
129098e16c Moving View group over to PHPUnit style group test. 2010-06-13 10:10:16 -04:00
mark_story
7c694bf560 Fixing comment. 2010-06-13 10:09:48 -04:00
mark_story
aee1c5483b Renaming test case classes to better reflect the filenames. 2010-06-13 10:06:00 -04:00
mark_story
d59544b64f Renaming test case classes to better match the filenames. 2010-06-13 10:01:37 -04:00
mark_story
7467a8d273 Moving converted group tests into cases tree. Eventually groups directory will disappear. 2010-06-13 00:01:47 -04:00
mark_story
629c0aeb37 Updating Helper group test. 2010-06-12 23:53:14 -04:00
mark_story
535c92dee1 Updating Javascript group test to recommended usage.
Removing code from the TestManager.
2010-06-12 23:51:40 -04:00
mark_story
d894f01f70 Updating Javascript group test to PHPUnit. 2010-06-12 23:44:20 -04:00
mark_story
4b2e9d3879 Seems that htmlhelper test is fine now. 2010-06-12 23:42:53 -04:00
mark_story
4556b6b2a2 First pass at moving the GroupTest to a TestSuite. 2010-06-12 23:32:01 -04:00
mark_story
6300027a87 Adding a condition for the fixture creation so it doesn't cause errors. 2010-06-12 23:31:36 -04:00
mark_story
86eb46ca87 Fixing path location for group tests. 2010-06-12 23:31:08 -04:00
mark_story
50144d6b5b Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 2010-06-12 22:50:09 -04:00
mark_story
f20cc8110b Adding a skip for persistModel as the feature is horribly broken right now. Controller test case is running with PHPUnit now. 2010-06-12 19:01:51 -04:00
mark_story
2c037c0bab Removing methods that are no longer called by PHPUnit. 2010-06-12 19:01:18 -04:00
mark_story
b2e61230ad Removing paintError() as it is no longer called.
Removing paintMethodStart() and paintMethodEnd() as they are no longer called and reference classes that no longer exist.
Implementing a skip printout for incomplete tests.
2010-06-12 18:55:27 -04:00
mark_story
2ec6f75996 Adding two incomplete tests as they are not implemented. Pulling component tests out of the controller test case. 2010-06-12 18:47:47 -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
José Lorenzo Rodríguez Urdaneta
0f33560515 Migrating Xcache test to phpunit 2010-06-10 23:11:29 -04:30
José Lorenzo Rodríguez Urdaneta
4021095422 Migrating TestManager test to phpunit 2010-06-10 21:59:03 -04:30
José Lorenzo Rodríguez Urdaneta
bfb023f581 Removing unused methods and documenting fixtures property 2010-06-10 21:28:22 -04:30
José Lorenzo Rodríguez Urdaneta
fb23b98c68 Migrating ClassRegistryTest to phpunit 2010-06-10 21:27:53 -04:30
José Lorenzo Rodríguez Urdaneta
754376ca7e Migrating AclComponent test to phpunit 2010-06-10 20:17:35 -04:30
mark_story
f0d755bd8e Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806 2010-06-10 19:11:26 -04:00
mark_story
9ee4a12a9d Adding additional tests for FormHelper::input() and checkbox generation and checked attribute being set for truthy values. Close #806 2010-06-10 12:48:55 -04:00
José Lorenzo Rodríguez
42e02bf289 Partially migrating EmailComponent test to phpunit, some tests need to have installed a local smtp server 2010-06-10 09:12:13 -04:30
mark_story
22f152824d Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-10 00:59:37 -04:00
mark_story
aa8d909764 Updating ProjectTask test case to PHPUnit. 2010-06-10 00:59:19 -04:00
José Lorenzo Rodríguez
d3ec9e1656 Converting CookieComponentTest to phpunit 2010-06-10 00:17:02 -04:30
José Lorenzo Rodríguez
fa8df12fa0 Converting AuthTest to phpunit. Adding setter and getter method loggedIn() 2010-06-10 00:03:49 -04:30
José Lorenzo Rodríguez
837e2574a3 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-10 00:03:24 -04:30
José Lorenzo Rodríguez
d35e02a1e1 Sending correct patch for previous commit 2010-06-10 00:02:45 -04:30
mark_story
bd801350e8 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-10 00:25:40 -04:00
mark_story
a91e8b870a Updating FixtureTask test case to use PHPUnit. 2010-06-10 00:25:23 -04:00
José Lorenzo Rodríguez
1b9eb035fd Migrating DboMyqli to phpunit 2010-06-09 23:00:35 -04:30
José Lorenzo Rodríguez
0a3e27b000 Migrating DboPostgres to phpunit 2010-06-09 22:52:28 -04:30
José Lorenzo Rodríguez
b3d9de1a97 Improving migration of DboMysqlTest to phpunit 2010-06-09 21:19:25 -04:30
José Lorenzo Rodríguez
a8328f3872 Migrating DboMysqlTest to PHPUnit 2010-06-09 21:03:46 -04:30
José Lorenzo Rodríguez
bc71e14041 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts:
	cake/tests/cases/libs/controller/components/session.test.php
2010-06-09 21:01:56 -04:30
José Lorenzo Rodríguez
9b3df1ea0e Migrating DboSourceTest to PHPUnit 2010-06-09 20:47:25 -04:30
mark_story
98a3239141 Updating TestTask test case to use PHPUnit. 2010-06-09 20:15:37 -04:00
mark_story
b723b92211 Fixing issues where App test case list could not be viewed.
Removing protected methods that only had one caller.
2010-06-09 18:37:24 -04:00
mark_story
574e1e7200 Updating PluginTask test case to use PHPUnit. 2010-06-09 18:11:21 -04:00
mark_story
2c6bf51bd2 Converting SessionComponent over to PHPUnit.
Adding a few getter/setter methods to fix visibility issues in the test cases.
2010-06-09 17:15:34 -04:00
mark_story
255d0c9d4f Fixing basics.php test for phpunit. 2010-06-09 17:07:36 -04:00
mark_story
d27381f3a2 Adding skipUnless compatibility method. 2010-06-09 17:07:17 -04:00
mark_story
ad8b70cec2 Removing continue statement that did nothing.
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
José Lorenzo Rodríguez
fa1ae280ca Migrating SessionComponentTest to PHPUnit and adding public accessor method for varible in SessionComponent 2010-06-09 09:30:00 -04:30
José Lorenzo Rodríguez
17054db31f Migrating ErrorTest to PHPUnit 2010-06-09 00:16:18 -04:30
José Lorenzo Rodríguez
b5539542a1 Removing unused code from DebuggerTest 2010-06-09 00:06:02 -04:30
José Lorenzo Rodríguez
c8399a8428 Removing assignments by reference in DebuggerTest 2010-06-09 00:04:31 -04:30
José Lorenzo Rodríguez
e71c827420 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-06-08 23:58:56 -04:30
José Lorenzo Rodríguez
08bcf4a615 Migrating DispatcherTest to PHPUnit, alos removing class dependencies from test folder home.ctp file 2010-06-08 23:58:01 -04:30
mark_story
f09a5bd953 Updating TemplateTask test cases to use PHPUnit. 2010-06-09 00:22:31 -04:00
mark_story
ac68f5c5db Updating Component test case to run on PHPUnit. 2010-06-09 00:13:52 -04:00
mark_story
c5e4ab2366 Adding return to RequestHandlerComponent::accepts() as it was missing.
Updating RequestHandlerComponent tests to work with PHPUnit.
2010-06-09 00:02:49 -04:00
mark_story
bca3c4ab38 Moving init() tests into separate test methods.
Adding tests for table prefixes on models being used as imports.
Fixing issue where tablePrefix was not accurately used when importing model information.  Fixes #765
2010-06-08 23:30:57 -04:00
mark_story
2f527cc5af Adding a few tests for DboSource::fullTableName(); 2010-06-08 23:29:40 -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
d0309d0c18 Fixing access violations in DbAcl test case. 2010-06-07 23:47:48 -04:00
mark_story
a88b8dd5b9 Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered.
Tests added.  Fixes #722
2010-06-07 23:43:35 -04:00
Kyle Robinson Young
a9fa7ac240 Fix for auth component userModel with plugins. Fixes #799 2010-06-07 23:19:13 -04:00
mark_story
ccd036eed0 Adding additional test cases for nld, dut, and nl. Closes #795 2010-06-07 23:10:53 -04:00
José Lorenzo Rodríguez
d3844dee56 Migrating DebuggerTest to phpunit 2010-06-07 00:10:35 -04:30
José Lorenzo Rodríguez
bd7ce3804e Migrating CakeSchemaTest to PHPUnit 2010-06-07 00:05:40 -04:30
José Lorenzo Rodríguez
e381be7a85 Migrating AclBehaviorTest to PHPUnit 2010-06-06 23:34:34 -04:30
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
predominant
26d526f624 Fix AuthComponent tests for windows newlines. 2010-06-07 01:22:08 +10:00
José Lorenzo Rodríguez
0aff378be8 Migrating TreeBehaviorTest to phpunit 2010-06-05 00:35:31 -04:30
José Lorenzo Rodríguez
d951e4a218 Migrating TranslateBehaviorTest to phpunit 2010-06-05 00:10:01 -04:30
José Lorenzo Rodríguez
fd4db4184a Migrated ConnectionManager to phpunit 2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
7aa01c4c77 Migrating SessionHelperTest to phpunit 2010-06-04 23:42:21 -04:30
José Lorenzo Rodríguez
94dd8a2543 Migrating ModelBehaviorTest to phpunit 2010-06-04 23:27:28 -04:30
José Lorenzo Rodríguez
d573be16c5 Adding compatibility method assertNotIdentical 2010-06-04 23:27:05 -04:30
José Lorenzo Rodríguez
d04278cb8e Migrating ModelIntegrationTest to PHPUnit 2010-06-04 23:19:33 -04:30
José Lorenzo Rodríguez
c23fe5d72e Migrating ModelReadTest to PHPUnit 2010-06-04 23:07:29 -04:30
mark_story
e41e89cd2a Making magic select not override magic hidden. Tests added.
Fixes #782
2010-06-04 00:20:14 -04:00
mark_story
bd6e16be26 Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789 2010-06-03 23:20:37 -04:00
Juan Basso
3c27c4c41e Ajusting smtpOption in EmailComponent. Fixes #779 2010-06-03 14:46:20 -03:00
José Lorenzo Rodríguez
2e7d2d5587 Migrating ModelWriteTest to phpunit 2010-06-02 00:30:52 -04:30
mark_story
7682c5896e Changing how merged rules are cleared so it doesn't generated notice errors in PHP4. Test added. Fixes #762 2010-06-01 23:41:51 -04:00
José Lorenzo Rodríguez
7d6ac7585a Migrating ModelValidationTest to phpunit 2010-06-01 00:19:11 -04:30
José Lorenzo Rodríguez
375dde87dc Migrating ModelDeleteTest to phpunit 2010-05-31 23:50:03 -04:30
José Lorenzo Rodríguez
c4b35ebc14 Fixing CakeFixtureManager::loadSingle to create the table if not exists 2010-05-31 23:49:18 -04:30
José Lorenzo Rodríguez
82da9be2ce Fixing issue with fixtures not being unloaded if the test method throws exceptions or fails in some unexpected way 2010-05-31 23:07:21 -04:30
José Lorenzo Rodríguez
ae4f3b24d8 Moving logic from methods that will be probably deprecated 2010-05-31 22:24:53 -04:30
José Lorenzo Rodríguez
33b2f0489a Migrating ThemeViewTest to phpunit 2010-05-31 22:23:22 -04:30
José Lorenzo Rodríguez
0743cee22f Migrating ViewTest to phpunit 2010-05-31 22:15:03 -04:30
José Lorenzo Rodríguez
b2f7afca11 Migrating SetTest to phpunit 2010-05-31 22:10:24 -04:30
José Lorenzo Rodríguez
499b8cf28e migrating HttpSocketTest to phpunit 2010-05-31 22:04:10 -04:30
José Lorenzo Rodríguez
3586626833 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit 2010-05-31 21:15:10 -04:30
mark_story
02a04abf6b Fixing return values of methods, and updating tests to run properly in Phpunit which uses exceptions instead of errors. 2010-05-30 22:57:28 -04:00
mark_story
ea2f0327f5 Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769 2010-05-30 22:46:46 -04:00
mark_story
22e942c2a3 Fixing most of the File test case issues with phpunit. 2010-05-30 22:46:42 -04:00
mark_story
75d7b46a35 Updating memcacheEngine test case so it passes under phpunit. 2010-05-30 22:39:45 -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
7ed67e5959 Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768 2010-05-30 20:30:58 -04:00
mark_story
c98a82c61c Fixing whitespace. 2010-05-30 20:28:00 -04:00
mark_story
66a8890f4f Fixing code formatting in test cases. 2010-05-30 12:51:48 -04:00
mark_story
07948a733d Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769 2010-05-30 11:16:40 -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