ceeram
4611c987db
Merge pull request #959 from ceeram/phpcsw
...
Make phpcs pass
2012-11-19 15:10:47 -08:00
Nicolas
a77e46cbfd
Added accidentally removed tests back in.
2012-11-17 23:14:40 +01:00
Nicolas
1b704fb7cf
Unit tests added.
2012-11-17 19:34:02 +01:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
Ceeram
6d0e32e642
fix coding standards, remove break after return/continue
2012-11-15 12:09:14 +01:00
mark_story
a7f192c606
Merge branch 'master' into 2.3
2012-11-14 21:50:29 -05:00
Mark Story
7206254166
Merge pull request #955 from dereuromark/master-tree-fixes
...
Asserting that tree behavior generates valid sql in recover
Fixes #3366
2012-11-14 18:03:05 -08:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
euromark
b7e75a6399
more whitespace coding standards
2012-11-14 12:36:55 +01:00
euromark
b48f105b3f
fix tabs to spaces
2012-11-14 09:55:33 +01:00
euromark
354069d229
cascade false for recover
2012-11-13 21:12:46 +01:00
ADmad
ac087ec938
Fix rules set being updated with array instead of CakeValidationRule objects. Closes #3367
2012-11-13 22:13:15 +05:30
euromark
22f65f7cb5
asserting that tree behavior generates valid sql in recover
2012-11-13 11:18:17 +01:00
mark_story
9ef9b8b662
Remove off by a second errors.
2012-11-12 21:47:05 -05:00
mark_story
e0586da808
Fix tests that occasionally fail on postgres.
2012-11-11 22:14:59 -05: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
mark_story
644d47c843
Fix ordering on another query that was failing on travis-ci.
2012-11-10 14:24:30 -05:00
ADmad
fa5ccf46d0
Fix coding standard errors
2012-11-04 02:52:00 +05:30
Jose Lorenzo Rodriguez
f04259d195
Fixing broken test
2012-11-03 14:51:39 +09:00
Ryan Morris
fa759231da
Update checkRequired to simply check if an array key is present rather than isset (which fails if the value is null)
2012-11-03 14:41:06 +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
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
Ceeram
093275aef6
Use correct value when using virtualFields in conditions and IN (), refs PR#897
...
Squashed commit of the following:
commit 6a986953e16601fb34a132df24ae16f882f218cf
Merge: babd714 118dd8c
Author: Ceeram <c33ram@gmail.com>
Date: Fri Nov 2 13:02:15 2012 +0100
Merge branch 'master' into virtualcondition
commit babd714d80178c68b0e3fbcc21fc53b846484fd8
Author: Ceeram <c33ram@gmail.com>
Date: Fri Nov 2 00:22:43 2012 +0100
fix incorrect tests
commit 9a46c13e1aa13905b8e5474947933676e03009ce
Author: Ceeram <c33ram@gmail.com>
Date: Thu Nov 1 11:44:19 2012 +0100
add test for regular fields and conditionKeysToString with IN
commit 3aa62e5cb93aa0c7bbb47e874fc1446873dd0d27
Merge: a8f0c3d 1f31340
Author: Ceeram <c33ram@gmail.com>
Date: Thu Nov 1 11:37:01 2012 +0100
Merge branch 'master' into virtualcondition
commit a8f0c3d918761ff2c456cc3a53f1e3ee5b1c6173
Author: Ceeram <c33ram@gmail.com>
Date: Thu Oct 11 16:46:10 2012 +0200
use correct value when using virtualFields in conditions and IN ()
2012-11-02 14:29:38 +01:00
Ceeram
b18550c667
fix incorrect tests
2012-11-02 12:16:32 +01:00
Ceeram
b8607ca2ed
fix fieldlist, refs PR808 and PR851
...
Squashed commit of the following:
commit 7007dba0eb836f852aaca95fada103bc4ba993a9
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date: Fri Nov 2 10:53:39 2012 +0100
Merge branch '2.3' into calinseciu-2.3
commit 3ca4d231bf80d2bb1c0572196f633da68c1a0db7
Author: Ceeram <c33ram@gmail.com>
Date: Sun Sep 23 12:45:00 2012 +0200
more tests added
commit e6b12532655671aff2b966a9be89b2625a715e8f
Author: Ceeram <c33ram@gmail.com>
Date: Tue Sep 18 09:18:32 2012 +0200
change methodname and visbilty
commit 70396265025190ab2fbc159911ec3e064cc44fb2
Author: Ceeram <c33ram@gmail.com>
Date: Thu Sep 6 17:26:52 2012 +0200
fix fieldlist, refs PR #808
commit e9db96bfe163609eeefba430d8353c822aabacb0
Merge: 99b798f
adb8142
Author: Ceeram <c33ram@gmail.com>
Date: Thu Sep 6 16:26:40 2012 +0200
Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3
commit adb8142d2694692ec71a063ac2ad1b275f3a67c9
Author: calinseciu <calinseciu@gmail.com>
Date: Thu Aug 30 17:57:50 2012 +0300
Add foreignKey to whitelist in saveAssociated()
Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
This happens if you don't send the foreignKey with the associated records data.
2012-11-02 10:56:49 +01:00
mark_story
ddd3baf703
Fix null column errors in SQLite and Postgres.
2012-11-01 21:07:29 -04:00
mark_story
1f31340a2a
Fix issue with Model::saveAssociated() and TranslateBehavior
...
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.
Fixes #3272
2012-10-31 23:13:56 -04:00
mark_story
414e0a3484
Fix totally incorrect test.
...
TranslateBehavior should never be overlapped with real fields.
It should only be used to add fields that don't exist on the parent
table.
2012-10-31 22:51:37 -04:00
Kyle Robinson Young
f10c669813
Code standards fixes
2012-10-29 08:14:17 -07: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
Ber Clausen
c741f60367
Make Model::find('first') always return an array.
2012-10-25 17:57:37 -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
mark_story
c4b9fa6c7a
Fix failing tests.
2012-10-24 21:00:56 -04:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
ADmad
1763f46340
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
Mark Story
746eaf9389
Merge pull request #894 from dereuromark/comp-fix-save-all
...
BC mod for saveAll()
2012-10-22 18:40:38 -07:00
mark_story
a0a61b5980
Fix issue where createSchema() would omit primary keys sometimes.
...
Fix missing primary key SQL when using the primary flag + other indexes.
Fixes #3292
2012-10-22 20:46:10 -04:00
mark_story
0b0b361e48
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
2012-10-20 20:48:11 -04:00
mark_story
08556ab879
Fix saveAssociated() with validate=first, atomic=false
...
When using the above options & validation errors on the associated
models, saving would not be aborted.
Fixes #3285
2012-10-20 15:12:05 -04:00
mark_story
888b1f4795
Fix issue with using contain() and query[contain]
...
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.
Fixes #3287
2012-10-20 14:51:52 -04:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
euromark
2dfb40bac0
remove duplicate line
2012-10-11 14:54:11 +02:00
euromark
1e2ac0b9c8
comp mod for saveAll()
...
better approach
test case to assert saveAll still behaves like previous versions
2012-10-11 14:03:59 +02:00
ADmad
5de492fb25
Allow saving new records with pre specified primary key value with treebehavior.
2012-10-11 01:03:49 +05:30
ADmad
33a879ff41
Fix find('count') with 'group' when result has only one group. Closes #1677
2012-10-09 10:43:27 +05:30
ADmad
a1aa73c1a2
Cache character set names
2012-10-07 21:58:49 +05:30
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
euromark
b7f1740d2b
correcting coding-standards
2012-09-28 13:49:51 +02:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
dogmatic69
6d4f4b57d7
adding a plugin propery to models wwith tests for ticket #85
...
Merge pull request #696
2012-09-20 21:31:31 -04:00
Ber Clausen
aaefbf1c2f
Add MySQL FULLTEXT support.
...
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext
Fixes #262
2012-09-20 20:42:30 -04:00
mark_story
a9750264e4
Revert "Add MySQL FULLTEXT support."
...
This reverts commit 36c99a358f
.
2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa
Merge pull request #862 from bar/mysql-fulltext
...
Add MySQL FULLTEXT support.
Fixes #262
2012-09-20 17:20:23 -07:00
Ber Clausen
36c99a358f
Add MySQL FULLTEXT support.
...
Minor optimizations and testing added.
2012-09-20 00:35:42 -03:00
mark_story
55dcb9c3b3
Implement resetSequence()
...
This is an optional method in DboSource that allows datasources to
resetSequence values in tables. This is useful for datasources like
Postgres, and makes using fixtures much easier.
Fixes #3026
2012-09-17 20:50:05 -04:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
mark_story
7d2cbec79d
Revert "Fix null not stopping model callbacks."
...
This reverts commit 82a8400def
.
The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
2012-09-13 22:49:17 -04:00
mark_story
82a8400def
Fix null not stopping model callbacks.
...
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks. This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.
Fixes #3123
2012-09-13 22:11:46 -04:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
mark_story
c7647b775f
Attempt to fix build error in travis.
2012-09-04 17:25:02 -04:00
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check()
)
2012-09-04 01:04:48 +02:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -
.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
d4ee62be61
Add support for biginteger on SQLserver.
2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d
Add bigint support for Sqlite.
...
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e
Add bigint support for postgres
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c
added tests for bigints
2012-08-30 14:48:59 +01:00
Jose Lorenzo Rodriguez
f6278488af
Ensuring list of behavior methods are refreshed between calls of
...
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf
Fixing issues with validation rules not being reset after calling
...
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
Ceeram
cb80338c7d
avoid duplication in return value when saving habtm
2012-08-24 00:50:46 +02:00
Ceeram
c5ebbc991c
Revert "Merge pull request #784 from ceeram/habtmmerge"
...
This reverts commit fa5aa6278f
, reversing
changes made to 88604ac757
.
2012-08-23 16:00:41 +02:00
Ceeram
fb0053753e
avoid duplication in returned results for habtm
2012-08-22 13:03:47 +02:00
mark_story
b0f2cfd1d1
Fix coding standards.
2012-08-15 20:19:08 -04:00
euromark
e1fbfcef00
fix contain for find method
2012-08-13 08:10:51 +02:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
788cf52572
Fix saving empty values for translated fields with multiple locales
2012-08-03 22:40:38 -04:00
Christopher Vrooman
bbd0b9dd8b
Tweaked DocBlocks
...
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
2012-08-03 22:40:28 -04:00
Christopher Vrooman
de1450763b
Added a failing test to testSavePartialFields
...
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
2012-08-03 21:19:44 -04:00
mark_story
cffc36e4e0
Fix notice error when impossible conditions are created.
...
Fixes #3084
2012-08-01 23:05:56 -04:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
mark_story
27e2132a13
Generated SQL should not contain multi-column primary keys
...
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.
Fixes #3069
2012-07-27 22:31:49 -04:00
mark_story
ed19821168
Merge branch 'master' into 2.3
2012-07-22 21:01:28 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076a
]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
2012-07-22 20:59:24 -04:00
mark_story
468302b526
Merge branch 'master' into 2.3
2012-07-21 20:59:56 -04:00
mark_story
473d55f091
Allow 1 second of slip.
2012-07-18 22:22:57 -04:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
mark_story
7979ee5fa0
Remove test that is no longer needed for validation.
2012-07-17 23:18:25 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
mark_story
928de97338
Add additional tests for error triggering on missing validator.
...
Closes #3039
2012-07-15 19:47:28 -04:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
Jose Lorenzo Rodriguez
39715bcd89
Adding missing afterValidate callback to behaviors, Fixes #3024
2012-07-10 20:35:26 -04:30
mark_story
5e680cb292
Add tests for translate + partial fields.
...
Refs #3009
2012-07-07 12:03:29 -04:00
mark_story
eb7b66b37c
Revert default value of allowEmpty.
...
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods. Move some tests around and update tests that
probably should have been failing before.
Fixes #2983
2012-06-24 20:06:14 -04:00
Ceeram
2f5f1b28bc
Merge branch '2.2-validatorrules' into 2.2
2012-06-20 15:01:26 +02:00
Ceeram
60c611fa47
Parse rules in getField()
2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
03d31b57f7
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099
Avoid using LC_ALL, on some installs this would cause error:
...
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69
Merge branch '2.1' into 2.2
2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7
Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
...
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
AD7six
d5cf2765dd
remove referencers to fixtures that don't exist
2012-06-18 16:40:37 +02:00
Ceeram
0df1e90eed
show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925
2012-06-18 14:20:53 +02:00
Kyle Robinson Young
54745aada9
Fix custom validation methods with CakeValidationSet
2012-06-11 23:28:45 -07:00
Jose Lorenzo Rodriguez
5ba5f906e6
Adding new test case for ModelValidator
2012-06-09 15:27:22 -04:30
Jose Lorenzo Rodriguez
51635c2ca6
Merge remote-tracking branch 'origin/2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e
Fixing yet another issue related to beforeValidate and
...
validateAssociated
2012-06-06 10:07:01 -04:30
mark_story
fceb028499
Fix code style errors.
2012-06-03 21:11:34 -04:00
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Jelle Henkens
e5eb7b490e
Preventing cache collisions by adding the the datasource key
2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605
Replacing crc32 with md5 for less collisions in method caching
2012-06-01 10:42:26 +01:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
Tigran Gabrielyan
1367e5b927
Fixed failing test case
2012-05-30 15:26:59 -07:00
mark_story
0bfcd49249
Fix unbindTranslation not unbinding.
...
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
2012-05-27 21:25:55 -04:00
Majna
364c293e16
Add test for belongsTo and hasOne optimization.
2012-05-27 23:16:20 +02:00
mark_story
1c0f97ea67
Fix some minor code style issues.
2012-05-27 14:20:19 -04:00
mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
mark_story
b27a3aab7b
Set session.gc_maxlifetime by default.
...
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings. Always set session.gc_maxlifetime so session files are
garbage collected correctly.
Fixes #2901
2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77
Fix array arguments being translated.
...
Fixes #2902
2012-05-23 21:02:41 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Jose Lorenzo Rodriguez
9cceb1553f
Improving ModelValidator::add() to allow multiple rules to be defined at once
2012-05-20 18:51:00 -04:30
mark_story
16a1a0ee79
Fix coding standards.
2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Jose Lorenzo Rodriguez
dc8c731ccb
Fixed failing test case
2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6
Merge branch '2.1' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
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
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Jelle Henkens
110536d575
Fixing CakeSchema to test APP_DIR with different names than all lowercase
2012-05-15 21:41:11 +01:00
mark_story
a3a2655fd5
Fix whitespace errors.
2012-05-11 21:38:21 -04:00
Jose Lorenzo Rodriguez
217bf85537
Implemented new method isEmptyAllowed in CakeValidationRule
2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
307197da9e
Merge branch '2.2' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-05-10 22:19:35 -04:30
Jose Lorenzo Rodriguez
280893155a
Renaming CakeRule to CakeValidationRule
2012-05-10 21:01:44 -04:30
Rachman Chavik
539fa3a131
fixing method signature in test models
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-10 20:55:47 -04:30
mark_story
7592eb94ac
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-10 20:55:46 -04:30
mark_story
d73bc6b867
Fix error in Sqlite tests.
2012-05-10 20:55:45 -04:30
mark_story
8334ebebed
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-10 20:55:45 -04:30
Rachman Chavik
73c66e2df4
fixing method signature in test models
2012-05-10 19:47:10 +07:00
Jose Lorenzo Rodriguez
0fb025f6dc
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-09 23:51:27 -04:30
mark_story
597913aa5b
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-07 21:36:28 -04:00
Jose Lorenzo Rodriguez
52c7b2383c
Added afterValidate callback to maintain consistency across all other callbacks in the model layer
2012-05-06 23:38:29 -04:30
mark_story
a1e06b9c8b
Fix error in Sqlite tests.
2012-05-06 23:39:02 -04:00
Jose Lorenzo Rodriguez
d4511af27b
Implemented add and remove in ModelValidator
2012-05-06 23:06:28 -04:30
Jose Lorenzo Rodriguez
a7222bccd6
Implemented removeRule in CakeValidationSet
2012-05-06 22:30:07 -04:30
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
ff91a0909a
Implemented countable interface for CakeValidationSet
2012-05-06 01:07:13 -04:30
Jose Lorenzo Rodriguez
989a8b8398
Implementing IteratorAggregate for CakeValidationSet
2012-05-05 21:13:09 -04:30
Jose Lorenzo Rodriguez
6f16a66b83
Implmenting ArrayAcces in CakeValidationSet
2012-05-05 21:00:40 -04:30
Jose Lorenzo Rodriguez
877e6c0f66
Removing the need for first param in CakeRule constructor
2012-05-05 19:41:48 -04:30
Jose Lorenzo Rodriguez
3199b9029b
Implemented countable interface for ModelValidator
2012-05-05 17:46:09 -04:30
Jose Lorenzo Rodriguez
81c0c3d91d
Implementing IteratorAggregate interface for ModelValidator
2012-05-05 17:34:35 -04:30
Jose Lorenzo Rodriguez
d35f8e6b00
Implementing ArrayAccess in ModelValidator
2012-05-05 15:52:02 -04:30
Jose Lorenzo Rodriguez
b6c8a345e7
Renaming CakeField to CakeValidationSet
2012-05-05 13:44:12 -04:30
Jose Lorenzo Rodriguez
843d95bb77
Renaming some methods ands removing others
2012-05-05 13:34:14 -04:30
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Jose Lorenzo Rodriguez
72e8992c25
Improving test coverage for CakeRule
2012-04-29 19:56:24 -04:30
Jose Lorenzo Rodriguez
d348bf6807
Refactoring again CakeRule, making all tests pass
2012-04-29 18:11:51 -04:30
Jose Lorenzo Rodriguez
deedd7a3ce
Even more tests passing now, almost there
2012-04-29 02:40:08 -04:30
Jose Lorenzo Rodriguez
66a568be89
More tests passing now
2012-04-29 01:09:36 -04:30
Jose Lorenzo Rodriguez
8700f3c7a2
Fixed some validation tests
2012-04-29 01:06:24 -04:30
Jose Lorenzo Rodriguez
30761f9153
Removed more redundant lines in ModelValidation tests
2012-04-29 00:46:56 -04:30
Jose Lorenzo Rodriguez
18c26119f3
Removing redundant code, cleaning up some sentences
2012-04-29 00:39:43 -04:30
Jose Lorenzo Rodriguez
c31f87b7a1
Refactored getMethods, got rid of validationErrors property in ModelValidator, made validateAssociated and many tests
...
pass
2012-04-29 00:24:35 -04:30
Jose Lorenzo Rodriguez
573d292ffa
Fixed more refereces to old method
2012-04-28 20:12:20 -04:30
José Lorenzo Rodríguez
d80b1ef7f6
Merge pull request #630 from shama/patch-typos
...
Typos in Test Cases
2012-04-27 07:42:40 -07:00
Kyle Robinson Young
eb059d3fa6
Fix typos in test cases
2012-04-26 20:14:52 -07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
mark_story
46bce1a00f
Merge branch '2.1' into 2.2
2012-04-26 22:27:44 -04:00
mark_story
6bb8b22cdb
Fix space indented code.
2012-04-26 22:27:34 -04:00
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0
Renamed method to check if the driver supports nested transaction.
2012-04-26 20:58:25 -04:00
Ceeram
ec9966ec6b
Adding tests for Validator
2012-04-25 09:38:58 +02:00
Thomas Ploch
324684c14f
Moving all validation logic into a new ModelValidator object.
2012-04-25 08:53:31 +02:00
Juan Basso
10a4b87979
Fixed tests with nested transaction in DboSource.
2012-04-24 22:28:47 -04:00
Juan Basso
5f722cb3d4
Update nested transaction test to use InnoDB table in MySQL.
2012-04-24 21:42:32 -04:00
Ceeram
0785ace172
fix error caused by non-existent fixture
2012-04-24 14:01:59 +02:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Juan Basso
7fe333ce4e
Merge branch '2.2-nested-transaction' into 2.2
2012-04-22 23:04:32 -04:00
ADmad
b1e7164d1a
Implemented translation of validation rule arguments in validation error messages. Closes #2816
2012-04-22 23:25:07 +05:30
Ceeram
f0bd7386e2
created, modified and updated fields now use static timestamp in testcases
2012-04-21 17:38:49 +02:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
2480ee1beb
Fix coding standards.
2012-04-20 20:52:10 -04:00
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
mark_story
ca2c122c62
Make flaky tests less flaky.
...
Off by one second errors are common here.
2012-04-17 20:51:52 -04:00
Ceeram
388b20dd9d
fix error in previous commit
2012-04-17 00:22:13 +02:00
Ceeram
a84597784d
avoid warning when saveAll() data has empty hasMany data, fixes #2792
2012-04-16 22:46:58 +02:00
mark_story
72c3059d94
Add missing parent calls.
...
Fixes piles of failing tests.
2012-04-15 22:20:34 -04:00
Juan Basso
37157806b9
Removing some dup code in nested transaction tests.
2012-04-14 16:46:47 -04:00
Juan Basso
7be5349b0c
Added configuration to disable nested transaction, even if the db supports it.
2012-04-14 16:43:24 -04:00
Juan Basso
b0a3a1a5aa
Added test to check when driver do not support nested support.
2012-04-14 16:25:23 -04:00
Juan Basso
79f7ca7d33
Oops, forgot one change in last commit.
2012-04-14 16:23:51 -04:00
Juan Basso
a512d46679
Sqlite is failing in PHP 5.2, re-adding the check for driver support.
2012-04-14 16:23:51 -04:00
Juan Basso
ffe0a18495
ReflectionMethod::setAccessible() is not compatible with PHP 5.2, causing fatal error in CI. Assuming that the db servers support nested transaction.
2012-04-14 16:23:51 -04:00
Juan Basso
22cd65b7d8
Added tests in each datasource to test the nested transactions.
2012-04-14 16:23:51 -04:00
Juan Basso
30258ac817
Added test for nested methods sequence.
2012-04-14 16:22:36 -04:00
Mark Story
6167529d4d
Merge pull request #605 from shama/patch-datasource-test
...
Add checks for startQuote & endQuote.
Fixes #2769
2012-04-14 08:08:05 -07:00
Kyle Robinson Young
6cf73c763c
Tests for a generic custom datasource
...
Default startQuote and endQuote to avoid error with non-database datasources
2012-04-11 10:08:45 -07:00
Kyle Robinson Young
8bbe250bec
Correct method descriptions and remove unused property
2012-04-11 07:50:54 -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
c2a8fca00c
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
2b7fe21ee0
remove all Set::extract() from core and tests
2012-04-05 01:33:57 +02:00
ADmad
1cc5206442
Merge branch '2.1-dbosource' into 2.1
2012-04-04 19:58:48 +05:30
ADmad
93639a7c43
Fixed bug where associated model's afterfind was not triggered in particular case
2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6
Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750
2012-04-04 15:07:45 +02:00
mark_story
72cb96b727
Fix a few more coding standards errors.
2012-04-02 23:23:53 -04:00
Ceeram
34a730dfd8
ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709
2012-04-02 18:48:02 +02:00
mark_story
4e67698506
Fix issues with SQLServer + boolean columns.
...
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.
Fixes #2439
2012-04-01 22:10:05 -04:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
ADmad
1763219053
Adding tests for getting session id when using DatabaseSession. Disproves #2734
2012-03-31 00:40:44 +05:30
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
6b045318d8
Merge branch '2.1' into 2.2
2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82
Fix Set::insert() not overwriting values.
...
Set::insert() failed to overwrite values that were previously
defined as strings. Remove test in SessionComponentTest that was
ensuring this bug stuck around.
Fixes #2722
2012-03-26 21:50:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
ADmad
c847ec216c
Changing assetEqual() to assertEquals()
2012-03-25 04:27:57 +05:30
Thomas Ploch
68e4e0e7ae
Revert "Added TestCakeSession::clear() to CakeSessionTest teardown."
...
This reverts commit b346ac961c
.
2012-03-24 21:43:25 +01:00
Thomas Ploch
b346ac961c
Added TestCakeSession::clear() to CakeSessionTest teardown.
2012-03-24 21:41:19 +01:00
Thomas Ploch
fda065101b
Fixed test cases for successful being built on travis.
2012-03-24 21:32:31 +01:00
mark_story
83ceef045d
Removing tests that fail on Postgres and Sqlite.
...
Fixes #2174
2012-03-23 21:21:18 -04:00
dogmatic69
a5685947b9
Adding failing tests for bool updates switching with the field name
2012-03-23 21:21:08 -04:00
Ceeram
d748fc7451
Merge branch '2.1' into 2.2
2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
Ceeram
0a94202fb6
fixing test of previous commit
2012-03-21 11:07:51 +01:00
Ceeram
4dfbfe9c8b
fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array
2012-03-21 10:38:04 +01:00
Ceeram
247f5522c6
add test for saveAll deep
2012-03-20 20:41:41 +01:00
Thomas Ploch
8ad65366dc
Fixed ModelWrite test. Removed undefined method calls to assertCount().
2012-03-20 15:06:26 +01:00
Ceeram
091ad53b80
ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type
2012-03-19 13:27:26 +01:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
dbb2dd44d7
Fix more coding standards.
2012-03-18 21:20:33 -04:00
Ceeram
4191e2e573
adding test to disprove ticket, closes #2691
2012-03-19 01:27:35 +01:00
mark_story
480c1bbb54
Fix coding standards.
2012-03-18 18:06:10 -04:00
mark_story
fc234d82f1
Fix coding standards in Case/Model/Behavior.
2012-03-18 14:31:13 -04:00
mark_story
346e048371
Fix coding standards in Datasource tests.
2012-03-18 13:08:27 -04:00
mark_story
6f8e7f1bc5
Revert "Fix coding standards errors."
...
This reverts commit 3362100512
.
2012-03-18 12:29:39 -04:00
mark_story
3362100512
Fix coding standards errors.
2012-03-18 12:20:24 -04:00
ADmad
bdddc85946
Making option 'unique' => 'keepExisting'
for HABTM association behave consistently with all acceptable data formats.
2012-03-18 13:43:21 +05:30
Ceeram
3e0294a695
Several fixes for testcases.
...
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-15 01:31:28 +01:00
Ceeram
9f9c6fdd67
ensure correct order in results as postgres does not always return in same order
2012-03-15 01:31:09 +01:00
Ceeram
40f4f54b34
Several fixes for testcases.
...
- Ensure correct ordering of find results
- avoid fatal error when testing email transport classes on 5.2
- add skips when running cross db join tests and multiple sqlite configs are defined
2012-03-14 15:08:46 +01:00
Ceeram
b871095125
ensure correct order in results as postgres does not always return in same order
2012-03-14 01:12:35 +01:00
dogmatic69
2ad0f8b8db
setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779
2012-03-13 17:40:25 +00:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
Ceeram
a2fb4178fb
Testcase added, refs #2672
2012-03-12 20:24:53 -04:00
mark_story
83a29f054e
Fix Session.cookieTimeout default behavior.
...
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.
Fixes #2669
2012-03-11 08:14:54 -04:00
Ceeram
2a7bee0a5c
make sure locale is restored correct in tests
2012-03-04 00:36:21 +01: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
Renan Gonçalves
3412c0cb0f
Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer.
2012-03-02 15:59:59 +01:00
mark_story
2665178ec9
Merge branch '2.0' into 2.1
2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1
Fixed a testcase, support PostgreSQL 9.1
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 06:32:31 -05:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f
Fix strict and warning errors from type hints.
2012-02-25 20:06:48 -05:00
euromark
973dce916a
php5 corrections
2012-02-25 19:46:07 -05:00
euromark
45112088a1
type hinting models
2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e
visibility attributes
2012-02-25 19:46:06 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
ADmad
4edb378ef8
Added ability to pass ID as parameter to Model::exists()
2012-02-24 19:42:23 +05:30
Mark Story
fd927207c1
Merge pull request #524 from shama/patch-typos
...
Typo fixes in the tests
2012-02-23 17:11:08 -08:00
Kyle Robinson Young
4176e59e52
Typo fixes in tests
2012-02-23 15:29:53 -08:00
Kyle Robinson Young
ea652394c7
Move DbAcl and IniAcl into Acl subfolder and rename Model/DbAclTest to AclNodeTest
2012-02-23 10:45:32 -08:00
Mark Story
b7302850b5
Merge pull request #467 from tPl0ch/2.1-required-update-create
...
Added support for simplified required validation on 'create' or 'update'. Fixes #230 .
2012-02-22 09:43:13 -08:00
José Lorenzo Rodríguez
74d837bef3
Merge pull request #512 from shama/patch-test-fixes
...
Fix missing class errors with ComponentCollectionTest and DbAclTest
2012-02-22 03:48:40 -08:00
Mark Story
cee8f2cebb
Merge pull request #508 from shama/patch-app-build
...
Updates to App::build() uses
2012-02-21 19:48:21 -08:00
Kyle Robinson Young
962fe7c571
Fix missing class errors
2012-02-18 06:32:48 -08:00
Mark Story
c2d753ffb4
Merge pull request #500 from shama/patch-visibility
...
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Mark Story
540f6669fd
Merge pull request #498 from shama/patch-loadFixtures
...
Remove unnecessary loadFixtures() calls
2012-02-21 17:28:52 -08:00
Mark Story
d7026204d5
Merge pull request #497 from shama/patch-crossSchemaTest
...
Cleaning up ModelCrossSchemaHabtm test case
2012-02-21 17:27:01 -08:00
Kyle Robinson Young
32e7943b00
Fix merge conflict with 62f8dea
2012-02-18 04:39:32 -08:00
Kyle Robinson Young
22582aee63
Upgrade legacy uses of App::build() types
2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8
Use App::RESET instead of true with App::build()
2012-02-18 04:04:54 -08:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
Kyle Robinson Young
75882507bc
Remove unnecessary loadFixtures() calls
2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637
Cleaning up ModelCrossSchemaHabtm test case
2012-02-16 22:25:53 -08:00
Kyle Robinson Young
4141a3ab5b
Load specific test plugins rather than all to avoid conflicts
2012-02-16 20:03:44 -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
Jose Lorenzo Rodriguez
4cfc033387
Fixing failing test cases
2012-02-13 00:26:10 -04:30
Ceeram
bc07ba3839
Added option['deep'] to saveAll, to save unlimited levels associated data
...
Squashed commit of the following:
commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 22:29:33 2012 +0100
update docblocks for deep save
commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:17:34 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:16:57 2012 +0100
Revert "adding info in docblock about associated model fieldList"
This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.
commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:05:18 2012 +0100
adding info in docblock about associated model fieldList
commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 17:51:44 2012 +0100
add tests for deep saveAll respecting fieldList option
commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 16:51:26 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date: Tue Feb 7 13:54:59 2012 +0100
Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data
commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date: Wed Jan 25 14:22:26 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date: Wed Jan 25 14:19:25 2012 +0100
validate all the things as well
commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date: Mon Jan 23 18:22:12 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date: Fri Dec 9 15:11:52 2011 +0100
making saveAll, saveMany and saveAssociated not limited to only save directly related models
2012-02-13 01:00:28 +01:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Mark Story
6502ab8f39
Merge pull request #473 from majna/2.1-cache-clear
...
Fix Cache::clear() calls in tests.
2012-02-10 15:56:21 -08:00
Ceeram
1f0af2a138
Adding order on created to the find, avoid failing test by incorrect order in postgres
2012-02-10 23:51:41 +01:00
Majna
42cbb8cafe
Fix Cache::clear() calls in tests.
2012-02-10 20:38:41 +01:00
Ceeram
028ba27522
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-02-10 17:26:16 +01:00
Ceeram
97f48dcdb3
fix failing test, caused by postgres ordering
2012-02-10 17:26:05 +01:00
mark_story
0cfec525b2
Allow SqlServer to execute procs correctly.
...
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.
Fixes #2558
2012-02-09 22:27:30 -05:00
Yasushi Ichikawa
e8a9d93eb5
Add params option to logQuery()
...
Parameters for prepared statements are now part of the
logged query data.
2012-02-08 20:15:40 -05:00
Thomas Ploch
4f3b266491
Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230 .
2012-02-07 12:15:04 +01:00
ADmad
610213dd6c
Added test for deleting dependent hasMany associated records. Refs #2553
2012-02-07 01:12:14 +05:30
Scott Harwell
dddcdd105e
Added test case for fix in e1738c8c
2012-02-05 13:37:54 -05:00
mark_story
d904ab00fa
Merge branch '2.0' into 2.1
2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8
fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464
2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
mark_story
dbece1f157
Add test for saveField() + foreign key.
...
Closes #2507
2012-01-24 20:32:48 -05:00
mark_story
b8e27c7588
Fix indentation.
2012-01-24 20:32:06 -05:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Jose Lorenzo Rodriguez
37314a2188
Logging transaction commands in DboSource, fixes #2457
2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52
Preventing datasource creationa and access on models having $useTable = false;
2012-01-21 14:03:11 -04:30
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Ceeram
d4e2fbf6b8
set correct default validate option, now matches saveAll/saveMany default value, fixes #2492
2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3
Merge changes from 1.3 to 2.0
...
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
2012-01-19 22:50:40 -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
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
c548b6b88a
Fix issue with find(count) and translated conditions.
...
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.
Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.
Fixes #2349
2012-01-08 20:40:25 -05:00
mark_story
9a67a70703
Fix failing test.
2012-01-07 20:24:33 -05:00
mark_story
beced84d2d
Fix illegal offset caused by TranslateBehavior.
...
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.
Fixes #2443
2012-01-07 11:58:35 -05:00
Jose Lorenzo Rodriguez
1991430584
Removing test that does not relate anymore to SqlServer datasource
2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d
Fixing a few SqlServer failing tests
2012-01-07 02:14:07 -04:30
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
c43b099894
Fix null bytea columns.
...
Apply patch from 'opiazer' Fixes #2432
2012-01-03 20:51:56 -05: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
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Rachman Chavik
b1aae5b5ab
add fullTableName tests with empty schemaName
2011-12-29 19:17:06 +07:00
Mark Story
2cc38b5ba7
Fix failing test in PHP5.4
2011-12-27 19:40:51 -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
mark_story
d8bc13f996
Fix incorrect time handling in deconstruct()
...
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.
Fixes #2412
2011-12-26 10:03:14 -05:00
ADmad
e4cc18c0e7
Changing test case to make it pass on Sqlite
2011-12-24 01:18:07 +05:30
ADmad
053ebf211e
More test case fixing
2011-12-24 01:04:38 +05:30
ADmad
f24c01c1f4
Fixed failing test cases.
2011-12-24 00:59:51 +05:30
ADmad
ba27c8c201
Added multi-model fieldList support
2011-12-23 02:07:48 +05: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
ADmad
1358af783b
Added test case for TreeBehavior::recover(). Refs #2392
2011-12-18 15:23:49 +05:30
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Rachman Chavik
a8d0447e61
fix fullTableName duplicate prefix, closes #2355
2011-12-14 14:35:20 +07:00
Kyle Robinson Young
060e225b76
Add test for Model::getID(), simplify return and remove dated @see link
2011-12-13 22:19:50 -08:00
mark_story
cfb6ed4cda
Fix failing tests.
2011-12-13 22:11:06 -05:00
mark_story
07a2a60468
Merge branch '2.0' into 2.1
2011-12-13 22:03:40 -05:00
mark_story
8d1edd72f2
Moving tests and un-skipping them.
...
Adding tests for proper field quoting in conditions.
Closes #2369
2011-12-13 21:26:03 -05:00
Rachman Chavik
d77f9aacde
updating multidb tests to use ConnectionManager
2011-12-13 21:10:16 +07:00
Rachman Chavik
a88ca54a8d
updating usage of assertEqual -> assertEquals
2011-12-13 21:03:40 +07:00
Kyle Robinson Young
b46c4b3e3f
Correcting assertEquals parameter order
2011-12-12 20:35:31 -08:00
Rachman Chavik
8b4e79c795
adding tests for LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:18:02 +07:00
mark_story
d63d51e3dd
Fix failing tests caused by incorrect mocks.
2011-12-11 23:07:01 -05: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
Jose Lorenzo Rodriguez
73aeb6ba62
Lazy-loading the $tablePrefix property in models, Fixes #2277
2011-12-08 00:10:22 -04:30
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
Mark Story
ba81754a1a
Merge pull request #352 from shama/patch-cakeschema-test-fix
...
CakeSchemaTest: Skip testSchemaReadWithConfigPrefix test if an existing prefix has been set
2011-12-05 11:46:47 -08:00
Mark Story
a32eabe492
Merge pull request #355 from shama/patch-casing
...
Consistently setting setUp() and tearDown() on test cases
2011-12-05 11:44:15 -08:00
ADmad
a062135d87
Merge pull request #354 from shama/patch-databasesession-test-fix
...
Fix DatabaseSessionTest garbage collection test case
2011-12-05 06:00:59 -08:00
Kyle Robinson Young
5388237099
Consistently setting setUp() and tearDown() on test cases
2011-12-04 13:27:51 -08:00
Kyle Robinson Young
66b3e9a7c9
Fix DatabaseSessionTest garbage collection test case
2011-12-04 13:04:42 -08:00
Kyle Robinson Young
8e70f4ac12
Fix CakeSession testCheckKeyWithSpaces and testUsingPluginHandler test cases
2011-12-04 12:43:27 -08:00
Kyle Robinson Young
42583ff6a5
Skip testSchemaReadWithConfigPrefix test if an existing prefix has already been set
2011-12-04 12:10:01 -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
mark_story
49708ec837
Fix cachefiles being generated with "
...
Cache files with SQLite should not contain "
Fixes #2323
2011-11-30 21:56:25 -05:00
Ceeram
b5c4b85601
Fixing cascading delete, when using foreignKey false and setting condition on hasOne.
2011-11-30 20:02:36 +01:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Rachman Chavik
1677e87512
fixing broken tests: update expected regex pattern
2011-11-25 22:36:44 +07: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
Rachman Chavik
c4cbf1c635
Adding cross schema test
2011-11-25 22:29:23 +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
mark_story
6d6ac10834
Fix failing tests caused by previous commit.
2011-11-20 23:00:58 -05:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05: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
Ceeram
0f299a1542
use old timestamp variable, to ensure test to pass
2011-11-17 13:09:03 +01:00
Jose Lorenzo Rodriguez
02912b6eeb
Correctly getting connection configs in CakeSchemaTest
2011-11-17 01:03:46 -04:30
Rachman Chavik
073d04931a
Adding tests for loading multischema fixtures
2011-11-17 11:24:45 +07:00
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Kyle Robinson Young
c97dca1570
Test case compatibility assertIsA() to assertInstanceOf()
2011-11-16 21:07:08 -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
Ceeram
3cb5188b2d
Fix failing test, moving timestamp define before the save to ensure it cannot be off by a second
2011-11-16 13:16:36 +01:00
Ceeram
025133db32
Fix tests which might fail due to unexpected order on finds
2011-11-16 13:15:14 +01:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Ceeram
9fd04307ff
adding sort on testresults, to avoid incorrect order returned by MySQL
2011-11-15 17:18:27 +01:00
Ceeram
37a932b6a7
adding testcase for saving habtm associations with no primary model data set
2011-11-15 16:47:25 +01:00
mark_story
87f5b6cf26
Fix more strict errors.
...
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
Ceeram
d8194a5818
Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0
2011-11-12 18:09:58 +01:00
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30
mark_story
d68053c4d4
Fix exception expectations.
...
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
2011-11-04 22:54:08 -04:00
mark_story
13900dc75c
Starting to fix issues with PHPUnit 3.6 compatibility.
2011-11-04 22:54:08 -04:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
mark_story
f531e7f24b
Fix UUID issue in SQLite
...
Only varchar(36) was interpreted as a uuid. char(36)
should also be treated this way. Most documentation refers
to this type. Also char(x) fields should be treated as strings,
not text.
Fixes #2184
2011-10-31 23:10:48 -04:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
43df8d34e7
Use String::tokenize() to split up fields.
...
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.
Fixes #2163
2011-10-26 21:17:20 -04:00
ADmad
1244656595
Prevent unneeded afterFind callback triggering on associated models. Fixes #2057
2011-10-26 19:36:32 +05:30
mark_story
ab6aab8a1a
Merge branch '2.0' into 2.1
2011-10-22 11:03:42 -04:00
mark_story
fe9e595913
Fix issue with postgres and virtualFields
...
If a virtualField was set to a literal value it would be quoted.
Test added.
Fixes #2085
2011-10-21 22:17:48 -04:00
Ceeram
2890e6659e
Fixing execute() $this->_result was not instance of PDOStatement after queries other then SELECT, lastAffected() now returns correct integer
2011-10-20 14:27:48 +02:00
AD7six
a538c5d220
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
2011-10-18 17:46:00 +02:00
AD7six
b4228dcaee
Merge branch '2.1' into 2.1-simpler-tests
2011-10-18 10:03:32 +02:00
Renan Gonçalves
229bf8e984
Keeping BC on short syntax for Acl and Tree behavior.
2011-10-16 12:06:41 +02:00
Renan Gonçalves
3a04bb4733
Dropping short syntax support for Behavior configuration.
...
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Renan Gonçalves
d9815dbd65
Fixing file_get_contents() call on the last commit.
2011-10-15 18:55:42 +02:00
Renan Gonçalves
704a9f454d
Moving binary data to external file, it was causing failures on other tests.
2011-10-15 18:51:48 +02:00
mark_story
6d9b709c7a
Fix method signatures of database drivers.
...
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.
Fixes #2100
2011-10-14 21:25:14 -04:00
Gonçalo Marrafa
4adc042882
Fix association lazy-loading when used with ContainableBehavior
2011-10-14 17:53:37 -04:30
Majna
8c3f64be52
Fixing doc blocks in Test suite and some visibility keywords.
2011-10-10 23:18:48 +02:00
kaz29
5eb4c5c6da
Fixing bug in getEncoding/setEncoding for PostgreSQL.
...
Fixes #2028
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012
Making test less specific as this float cast is different
...
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a
Fixing failing tests caused by merge with 1.3
2011-10-06 21:23:35 -04:00
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
Jose Lorenzo Rodriguez
ade9e4d154
Fixing another postgres failing test
2011-10-05 21:36:36 -04:30
Jose Lorenzo Rodriguez
16ffee0065
More fixes in checking dates in tests
2011-10-05 12:16:00 -04:30
Jose Lorenzo Rodriguez
746062d4a4
Fixing a couple of problem when testing dates in ModelWriteTest
2011-10-05 10:16:38 -04:30
Jose Lorenzo Rodriguez
0a2553cce5
Making model tests less time dependent
2011-10-03 14:51:07 -04:30
mark_story
3907c2bdf3
Fixing build failure in Postgres.
2011-10-01 22:49:57 -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
Jose Lorenzo Rodriguez
5d19b6ded9
Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass
2011-10-01 15:25:17 -04:30
Jose Lorenzo Rodriguez
61be5b1d5c
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589
Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times.
2011-10-01 14:06:41 -04:30
mark_story
d9db8c8124
Fixing failing test on postgres build.
2011-10-01 09:08:18 -04:00
mark_story
df82aa09e4
Removing test that causes problems in AllTests.
2011-09-30 22:47:47 -04:00
mark_story
af4b0c9c1b
Make DboSource::lastError() fallback to the connection.
...
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError(). Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00
mark_story
a3f25ee5e3
Fixing issue with integer columns and NULL values.
...
Fixes #2037
2011-09-29 20:28:52 -04:00
Jose Lorenzo Rodriguez
fbdb058441
Converting regular expression assertions to simple string contains, those perform faster and consume less memory
2011-09-29 00:05:15 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29
Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite
2011-09-28 22:57:50 -04:30
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
mark_story
7e44836837
Fixing failing test.
2011-09-26 21:46:25 -04:00
Yosuke Basuke Suzuki
5612d411f3
Added unittest for saveAll() validation with the data no id assigned.
2011-09-23 22:23:26 +09:00
mark_story
8d43764801
Fix issue with duplicate associations when using string form.
...
Fixes #2002
2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc
Merge branch '1.3' into merger
...
Conflicts:
cake/basics.php
cake/console/libs/tasks/extract.php
cake/libs/view/helpers/js.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/test_app/views/pages/extract.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Model/Behavior/ContainableBehavior.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
lib/Cake/Test/Case/Model/CakeSchemaTest.php
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
mark_story
09e7f1d491
Splitting apart the Scaffold and ScaffoldView tests.
...
Fixes #1985
2011-09-16 22:08:19 -04:00
Renan Gonçalves
4378bb6dc4
Fixed bug in CakeSchema where it determines the field position.
...
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
2011-09-16 15:28:28 +02:00
Jelle Henkens
7ba2f90b2a
Refactoring expectError() calls to PHPUnit annotations
2011-09-13 19:56:37 +01:00
mark_story
d74f442608
Making test case class names match file names.
...
Refs #1985
2011-09-12 23:01:04 -04:00
ADmad
97a975c6c4
Refactoring Model::invalidFields() a bit.
2011-09-12 05:10:34 +05:30
AD7six
61f8de440d
Merge branch '2.0-simpler-test' of github.com:cakephp/cakephp into feature/2.0-simpler-tests
...
Conflicts:
lib/Cake/Console/Command/TestShell.php
2011-09-10 17:08:00 +02:00
mark_story
39c270fd84
Attempting to fix build failure in Jenkins.
2011-09-05 21:53:29 -04: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
149deba416
Fixing Mysql test case after making the DboSource throw exceptions
2011-09-03 19:12:06 -04:30
Jose Lorenzo Rodriguez
74ba030e7c
More postgres tests passing again
2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
61ff8d6154
Making DboSource tests more portable
2011-09-03 18:07:26 -04:30
Jose Lorenzo Rodriguez
d06d5f8738
Not checking length on databases that won't return it for floats
2011-09-03 17:21:48 -04:30
Jose Lorenzo Rodriguez
fcf58371fd
Fixing a failing postgres test
2011-09-03 17:09:41 -04:30
Jose Lorenzo Rodriguez
7003edeb8f
Adding missing expectedException annotations
2011-09-03 17:05:09 -04:30
Jose Lorenzo Rodriguez
0ca8af2c22
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 17:01:49 -04:30
Jose Lorenzo Rodriguez
f0ef0aab62
Making postgres tests pass
2011-09-03 17:00:16 -04:30
mark_story
2c21fc90fb
Fixing failing tests and issues with Sqlite.
2011-09-03 22:07:45 +01:00
Jose Lorenzo Rodriguez
49b8b24ac2
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 13:09:04 -04:30
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
Jose Lorenzo Rodriguez
36470f4a86
Removing $error property from DboSource, errors in queries will throw exceptions now
2011-09-03 12:17:00 -04:30
Jose Lorenzo Rodriguez
89b1e54071
Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version
2011-09-03 06:50:19 -04:30
mark_story
85d9b1af8d
Fixing failing tests caused by path/object cache issues.
2011-09-03 01:14:51 +01:00
Juan Basso
e9390985ca
Changed mergeAssociation scrubQueryData to be protected.
2011-08-21 21:27:35 -04:00
Juan Basso
a1a049c700
Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/View/Helper/CacheHelper.php
2011-08-20 01:47:27 -04:00
ADmad
c3884f407f
Implemented feature to allow multiple counter caches per associated model.
2011-08-17 18:10:32 +05:30
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
ADmad
7983b4109b
Data returned by Model::save() not contains primary key too when new record is created. Closes #1869
2011-08-14 02:56:08 +05:30
Jose Lorenzo Rodriguez
1726bad396
Adding ability to Set class to iterate on ArrayObjects, or any object implementing ArrayAccess and Traversable
2011-08-11 13:26:06 -04:30
ADmad
9577fb0ca2
Fixed TreeBehavior::childCount(). Closes #1833
2011-07-31 12:39:52 +05:30
ADmad
b15c77ecc3
Enhancing validation messages to have placeholders. Closes #1855
2011-07-31 06:33:56 +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
Ceeram
b8daa99cac
Splitting saveAll into separate save and validation methods for many rows and associated rows. Closes ticket #1157
2011-07-25 09:39:03 +02:00
Jose Lorenzo Rodriguez
50d4330487
Ensuring uniqueness of method cache keys, all tests passing now
2011-07-17 23:45:22 -04:30
Jose Lorenzo Rodriguez
08be8300ee
Merge branch '2.0' into 2.0-dbo-performance
2011-07-17 23:22:58 -04:30
Jose Lorenzo Rodriguez
222df2c315
Removing unneeded assert that fails when run in the all test suite
2011-07-17 23:12:51 -04:30
Jose Lorenzo Rodriguez
b603232aee
Removing redundant call to DboSource::fields(), the fields come already quoted from DboSource::read()
2011-07-17 17:42:47 -04:30
José Lorenzo Rodríguez
7596fcf45a
Merge pull request #153 from ajibarra/e4c1f28d849c6a60c369265a502315260babe80b
...
Preventing AppModel to be inspected inside CakeSchema
2011-07-15 14:48:01 -07:00
José Lorenzo Rodríguez
57a8c108a6
Merge pull request #147 from burzum/feature/2.0-return-query
...
Feature/2.0 return query
2011-07-15 14:10:08 -07:00
Alejandro Ibarra
e4c1f28d84
Included validation to skip AppModel on CakeSchema->readSchema because it tries to find 'app_models' table. Added testSchemaReadWithAppModel test
2011-07-15 15:18:38 -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
Majna
cde13daed4
Refactored DatabaseSession to use only 'Session.handler.model' config. Fixed static call on non-static method DatabaseSession::gc(). Fix for SessionFixture -primary key too long (MySQL Error: 1071)
2011-07-11 00:16:41 +02:00
Mark Story
08f1afe328
Updating varchar, text columns to use nvarchar.
...
This storage type stores unicode properly, and is the
saner default datatype for most applications.
Fixes #1321
2011-06-23 23:01:17 -07:00
Mark Story
6bcfd19ea7
Fixing tests that shouldn't have been changed.
2011-06-23 16:27:59 -07:00
Mark Story
9ab2ec7d49
Adding support for Unicode characters. Refs #1321
2011-06-23 15:46:03 -07:00
Mark Story
91a1cf81f3
Merge branch '1.3' into merger
...
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
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
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
e33a9a7846
Adding new limit/offset pagination for SQLServer 11.
2011-06-22 17:01:36 -07:00
Mark Story
1a155c80c0
Fixing support for nchar and nvarchar fields in SQL server.
...
These fields report their length as double of what its defined.
2011-06-22 11:39:06 -07:00
Mark Story
1df0801c33
Updating SQLServer test to pass when the app has a model.
2011-06-22 11:08:14 -07:00
Mark Story
a825d8280f
Adding support for SQLServer's datetime2 column,
...
as that is the preferred datetime format in SQLServer.
2011-06-22 10:24:45 -07:00
Mark Story
0c1472ee44
Adding better support for nvarchar(MAX) in SQLServer
...
Newer versions of SQLServer perfer to use nvarchar(max) for
text columns.
2011-06-22 09:05:06 -07:00
Jose Lorenzo Rodriguez
d0ef655601
Using the field name for aliasing for Sqlsrv as in Postgres, removing dead code
2011-06-21 18:58:33 -04:30
Jose Lorenzo Rodriguez
97e51f1d94
Removing Sqlserver::value() as it is already abstracted in DboSource
2011-06-21 18:07:05 -04:30
Mark Story
4deedf6da2
Removing extra paging result that ends up because of SQLserver 10 workarounds.
2011-06-21 13:17:49 -07:00
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Jose Lorenzo Rodriguez
2a39e6869c
Merge branch '2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
2011-06-17 18:04:03 -04:30
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
AD7six
dcf14a7a44
rename the model test such that is coincides with the file it's testing
2011-05-29 01:22:38 +02:00
ADmad
e5f2f6a236
Fixing test cases
2011-05-29 02:50:09 +05:30
Jose Lorenzo Rodriguez
e669a81e0a
Reverting change in ConnectionManager, sourceList() will only return the instantiated datasources
...
Fixing remaining tests failing due to contamination of loaded plugin is app
2011-05-27 02:28:38 -04:30
Jose Lorenzo Rodriguez
b320e4323f
Improving ConnectionManager tests
2011-05-27 02:13:35 -04:30
Renan Gonçalves
3f72c92226
Removing the unset(->db); since it trigger errors by the Fixture Manager when it tries to drop the created tables.
2011-05-24 19:56:45 +02:00
Renan Gonçalves
2ca849a068
Tests no longer have access to ->_fixtures, refactoring it to use Fixture Manager instead.
2011-05-24 19:56:04 +02:00
Renan Gonçalves
33d00380ed
Fixing cross database tests by making sure the fixture was created for the right database.
2011-05-24 19:32:38 +02:00
Renan Gonçalves
423fa8127e
Skipping Oracle tests if not using Oracle configuration.
2011-05-24 18:45:10 +02:00
Renan Gonçalves
a6ed66892e
Including SqlServer and Oracle tests to the AllDatabase tests.
2011-05-24 18:41:51 +02:00
Juan Basso
02d4188a29
Skipping tests that is not compatible with SQL Server.
2011-05-23 23:16:13 -04:00
Juan Basso
0ae9974b3f
Updating the test to be compatible with others dbo drivers.
2011-05-23 00:31:21 -04:00
Juan Basso
39320ef352
Renamed the Mssql driver to Sqlserver.
2011-05-22 23:19:13 -04:00
Juan Basso
846634d729
Changed the test to be compatible with all tests.
2011-05-22 22:50:29 -04:00
Juan Basso
76831863e3
Skipping tests that is not compatible with SQL Server.
2011-05-22 22:21:01 -04:00
Juan Basso
195653bdfc
Updated the Mssql tests with fixes of insertMulti.
2011-05-22 01:11:57 -04:00
Juan Basso
82e2d9e271
Updating model tests to support Mssql driver.
2011-05-22 00:59:15 -04:00
Juan Basso
11d249e43b
Updating PHPDoc and method visibility.
2011-05-21 22:18:57 -04:00
Juan Basso
3e4cd4fdbb
Removed the simulate flag that is not used.
2011-05-21 22:10:05 -04:00
Renan Gonçalves
c602fc845b
Reverting the change to insertMulti, worked to solve the cache issue when trying to get the model schema.
2011-05-18 20:59:17 +02: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
Renan Gonçalves
d1a984cde9
Resolving merge conflict.
2011-05-18 19:58:12 +02:00
AD7six
6e29bb4d94
fix ModelIntegrationTest part 1
2011-05-17 21:48:16 +02:00
Jose Lorenzo Rodriguez
7ef1a2995a
Fixing failing tests due to massive search and replace
2011-05-16 23:45:35 -04:30
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
AD7six
8e27cf992f
correct a few missing constant replacements
2011-05-15 18:49:38 +02:00
AD7six
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
AD7six
bd0a303c09
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-05-15 11:28:47 +02:00
Jose Lorenzo Rodriguez
a6fb16beef
Moving tests cases to their new location
2011-05-15 00:42:10 -04:30
Jose Lorenzo Rodriguez
91bce16e9d
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
7ba60ff424
Changing more paths
2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
8746a485bd
Search and replace for changed paths
2011-05-13 02:53:35 -04:30
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30