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