mark_story
|
82d20ed948
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/View/MediaViewTest.php
|
2012-11-24 15:44:52 -05:00 |
|
mark_story
|
0d29861423
|
Fix order for finds
This should solve more occasional errors in postgres on travis.
|
2012-11-21 21:52:23 -05:00 |
|
Ceeram
|
eadc3a75e5
|
fix coding standards
|
2012-11-21 15:39:03 +01:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
mark_story
|
e0aab77dab
|
Merge branch 'master' into 2.3
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
|
2012-11-10 21:33:26 -05:00 |
|
Jose Lorenzo Rodriguez
|
f04259d195
|
Fixing broken test
|
2012-11-03 14:51:39 +09:00 |
|
mark_story
|
9007406b9d
|
Fix another test that sometimes fails on travis.
|
2012-11-02 22:07:24 -04:00 |
|
mark_story
|
ce3aa692b5
|
Use set order for test that failed on travis.
|
2012-11-02 18:06:59 -04:00 |
|
mark_story
|
478461d301
|
Merge branch 'master' into 2.3
|
2012-10-28 21:42:48 -04:00 |
|
mark_story
|
d9a3ab844f
|
Fix another test that fails on postgres sometimes.
|
2012-10-28 21:16:50 -04:00 |
|
mark_story
|
ab2ce29bd6
|
Fix a few more tests that sometimes fail on postgres.
|
2012-10-28 16:11:07 -04:00 |
|
mark_story
|
c24bec679b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/View/Helper/FormHelper.php
|
2012-10-27 21:13:53 -04:00 |
|
Ber Clausen
|
a7d9422c09
|
Test all empty array with assertSame() because assertEquals() does not check the type.
|
2012-10-26 19:21:51 -03:00 |
|
mark_story
|
9e0778951a
|
Add some fixed orders.
Hopefully this makes tests in postgres more reliable.
|
2012-10-24 21:27:01 -04:00 |
|
ADmad
|
33a879ff41
|
Fix find('count') with 'group' when result has only one group. Closes #1677
|
2012-10-09 10:43:27 +05:30 |
|
mark_story
|
cffc36e4e0
|
Fix notice error when impossible conditions are created.
Fixes #3084
|
2012-08-01 23:05:56 -04:00 |
|
mark_story
|
ad31caeb0e
|
Merge branch '2.1' into 2.2
|
2012-05-20 14:53:41 -04:00 |
|
Ceeram
|
7dbd6bc3a2
|
make sure model data is moved to alias, even when first key in data is assoc model
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
|
2012-05-19 14:41:16 -04:30 |
|
mark_story
|
a3a2655fd5
|
Fix whitespace errors.
|
2012-05-11 21:38:21 -04:00 |
|
Jose Lorenzo Rodriguez
|
bf0f5ab118
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-04-29 20:05:39 -04:30 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
mark_story
|
9f9feec222
|
Merge branch '2.2-hash' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
|
2012-04-10 21:32:37 -04:00 |
|
Ceeram
|
2b7fe21ee0
|
remove all Set::extract() from core and tests
|
2012-04-05 01:33:57 +02:00 |
|
ADmad
|
93639a7c43
|
Fixed bug where associated model's afterfind was not triggered in particular case
|
2012-04-04 19:48:37 +05:30 |
|
mark_story
|
19e0d8d946
|
Switch usage to Hash where possible.
|
2012-03-26 22:32:53 -04:00 |
|
Kyle Robinson Young
|
90e7afbdc7
|
Correct parameter order of assertEquals and assertNotEquals
|
2012-03-22 23:37:12 -07:00 |
|
mark_story
|
dbb2dd44d7
|
Fix more coding standards.
|
2012-03-18 21:20:33 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
Ceeram
|
08a4d0bf63
|
Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds
|
2012-03-03 23:55:03 +01:00 |
|
ADmad
|
4edb378ef8
|
Added ability to pass ID as parameter to Model::exists()
|
2012-02-24 19:42:23 +05:30 |
|
Kyle Robinson Young
|
4176e59e52
|
Typo fixes in tests
|
2012-02-23 15:29:53 -08:00 |
|
Majna
|
d41e5621b7
|
Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
|
2012-02-16 19:28:21 +01:00 |
|
Scott Harwell
|
dddcdd105e
|
Added test case for fix in e1738c8c
|
2012-02-05 13:37:54 -05:00 |
|
Ceeram
|
2a9e6771c3
|
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
|
2012-01-19 23:26:43 +01:00 |
|
AD7six
|
7b640b8123
|
move find threaded logic to the set class
|
2012-01-10 00:24:38 +01:00 |
|
mark_story
|
b4faa00703
|
Adding error to find(threaded).
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
|
2012-01-02 13:46:35 -05:00 |
|
Jose Lorenzo Rodriguez
|
1651257919
|
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
|
2011-12-26 13:06:48 -04:30 |
|
ADmad
|
389072708a
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
|
2011-12-22 03:15:04 +05:30 |
|
euromark
|
a41539dfa4
|
Indentation fix (tab instead of spaces)
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
|
2011-12-20 22:26:43 -05:00 |
|
mark_story
|
07a2a60468
|
Merge branch '2.0' into 2.1
|
2011-12-13 22:03:40 -05:00 |
|
Kyle Robinson Young
|
b46c4b3e3f
|
Correcting assertEquals parameter order
|
2011-12-12 20:35:31 -08:00 |
|
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 |
|