Commit graph

135 commits

Author SHA1 Message Date
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Rachman Chavik
1f7c292651 fixing broken tests: updating fullTableName() use
At the same time, reversing arguments since phpunit wants 'expected' as
the first parameter.
2011-11-25 22:36:44 +07:00
Ceeram
179a5c8559 remove order, which was required with setting default order on CakeTestModel 2011-11-24 22:20:29 +01:00
Ceeram
05940ae1ec adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified 2011-11-22 21:50:17 +01:00
m
2957a33b23 assertEqual to assertEquals in core test files
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-19 09:25:03 -05:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
Ceeram
e5c8a446d6 Add sorting on joined model virtual field, fixes #2250 2011-11-17 00:18:12 +01:00
ADmad
1244656595 Prevent unneeded afterFind callback triggering on associated models. Fixes #2057 2011-10-26 19:36:32 +05:30
mark_story
055224ef68 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
mark_story
d9db8c8124 Fixing failing test on postgres build. 2011-10-01 09:08:18 -04:00
ADmad
33030a4502 Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677, #573 2011-09-28 02:58:48 +05:30
Jelle Henkens
7ba2f90b2a Refactoring expectError() calls to PHPUnit annotations 2011-09-13 19:56:37 +01:00
Jose Lorenzo Rodriguez
12c73806f4 Skipping tests on Sqlite that involve creating a duplicate connection/ It is not possible to open multiple connections to it 2011-09-03 21:07:40 -04:30
Jose Lorenzo Rodriguez
7003edeb8f Adding missing expectedException annotations 2011-09-03 17:05:09 -04:30
mark_story
2c21fc90fb Fixing failing tests and issues with Sqlite. 2011-09-03 22:07:45 +01:00
mark_story
2ceea79862 Fixing errors and failing tests with SQLite.
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
2011-09-03 18:37:29 +01:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
ADmad
ef4826eb70 Making Model::find('count') behave nicely when 'group' key is specified in options. Closes #1677 2011-08-14 07:37:23 +05:30
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Florian Krmer
adb943b7fd Refactoring the code to build the query array as suggested here https://github.com/cakephp/cakephp/pull/147#issuecomment-1553663 2011-07-12 23:31:07 +02:00
Florian Krmer
9d7c97c296 Adding the "returnQuery" key to the 2nd argument of the find() method to be able to get the query array back from the before state of findMethod() calls. This was required in the past for some more complex queries and is in 2.0 no longer possible because the find methods became protected. 2011-07-12 01:04:22 +02:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Juan Basso
aacb921695 Pattern to use skipIf in tests. 2011-05-30 20:51:36 -04:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
Juan Basso
82e2d9e271 Updating model tests to support Mssql driver. 2011-05-22 00:59:15 -04:00
Renan Gonçalves
37b9bd59bc Trying to fix the Mssql as much as possible.
Adding  parameter to the insertMulti() method because Mssql tries to get the table schema and it fails most of the time.
2011-05-18 20:12:36 +02:00
AD7six
0a53242e3e correcting all the inverted assertEqual tests
$expected is the first argument. Now certain test results start to make
sense:

	1) MultibyteTest::testUsingMbStrtolower
	Failed asserting that two strings are equal.
	--- Expected
	+++ Actual
	@@ @@
	-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
	+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30
Renamed from lib/Cake/tests/Case/Model/ModelReadTest.php (Browse further)