Commit graph

15023 commits

Author SHA1 Message Date
mark_story
321caf6db6 Fix incorrect value being stored in Auth.redirect.
An incorrect value would be stored in Auth.redirect when
a custom route with the `pass` key set.

Fixes #2366
2011-12-15 22:56:39 -05:00
Mark Story
4ed2185876 Merge pull request #379 from shama/patch-code-formatting
Patch code formatting
2011-12-15 05:44:17 -08:00
Mark Story
33773a92dc Merge pull request #378 from shama/patch-debug-flag
Add debug flag to flush output
2011-12-15 05:43:36 -08:00
Kyle Robinson Young
54ed278284 Code formatting 2011-12-14 22:54:03 -08:00
Rachman Chavik
577225b8a6 include schema name when storing in _sequenceMap 2011-12-15 13:49:48 +07:00
Kyle Robinson Young
b3396538b7 Add debug flag to flush output 2011-12-14 22:48:41 -08:00
Ceeram
3f8934634b remove cheating, sort() always returns true 2011-12-15 01:18:11 +01:00
Ceeram
e4d7ebfa3e Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-12-15 01:13:54 +01:00
ADmad
01b04314c9 Fixing possible test case failure 2011-12-15 03:20:09 +05:30
ADmad
16d29a8d0e Making Folder::delete() code more PHP5ish 2011-12-15 03:07:17 +05:30
euromark
9d6ea57c30 Fix missing App::uses() added
Fixes #2374

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-14 08:08:35 -05:00
Mark Story
102b96f25c Merge pull request #377 from shama/2.0
Fix typo on TranslateBehavior error message
2011-12-14 05:04:00 -08:00
Mark Story
df3759c8b6 Merge pull request #376 from shama/patch-getid-test
Add test for Model::getID(), simplify return and remove dated @see link
2011-12-14 05:03:38 -08:00
Rachman Chavik
a8d0447e61 fix fullTableName duplicate prefix, closes #2355 2011-12-14 14:35:20 +07:00
Rachman Chavik
d2eac08e6b fixing previous incomplete fix 2011-12-14 14:34:41 +07:00
Kyle Robinson Young
e6e0027ec7 Fix typo on TranslateBehavior error message 2011-12-13 22:28:55 -08: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
Graham Weldon
d83115927d Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-12-14 16:04:40 +11: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
b61e3e0378 Fix lies in Shell::createFile()
It could lie if the file was not writable.

Fixes #2371
2011-12-13 21:59:58 -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
mark_story
dd335cb183 Fix error in FixtureTask
The options are always set, use empty() instead.

Fixes #2373
2011-12-13 20:40:30 -05:00
Rachman Chavik
6505dd8e29 fixing conflict resolution in 2e8498e1 re: pgsql 2011-12-14 07:50:44 +07:00
José Lorenzo Rodríguez
0b7d0d7c94 Merge pull request #374 from shama/patch-api-link
Update api link to 2.0 on default home page
2011-12-13 06:10:47 -08: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
Rachman Chavik
8444911761 Merge pull request #273 from rchavik/#275
Fixes #275 (lighthouse) Old HABTM links should not be deleted when new HABTM links contain these
2011-12-13 05:33:03 -08:00
Kyle Robinson Young
5110b976f8 Update api link to 2.0 on default home page 2011-12-13 04:47:08 -08:00
ceeram
276ae155ab Merge pull request #373 from shama/patch-test-case-order
Correcting assertEquals parameter order
2011-12-13 04:02:17 -08:00
Kyle Robinson Young
b46c4b3e3f Correcting assertEquals parameter order 2011-12-12 20:35:31 -08:00
mark_story
645ef47878 Fix multiple date formats in Validation::date()
Fixes #2364
2011-12-12 20:21:10 -05:00
Mark Story
4a1a46a998 Merge pull request #372 from shama/patch-controller-test-case
Fix overreaching Inflector when ControllerTestCase autoMocks
2011-12-12 11:21:51 -08:00
Kyle Robinson Young
096ff76295 Fix overreaching Inflector when ControllerTestCase autoMocks 2011-12-12 10:29:33 -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
Rachman Chavik
90af608489 keep existing data in unique HABTM closes LH 275
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07:00
mark_story
ab5bfdccfd Fix bad merge and failing test. 2011-12-11 23:20:19 -05: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
mark_story
8bb6f8803c Fix infinite loop when minYear/maxYear are not int.
Refs #2361
2011-12-11 22:11:14 -05:00
mark_story
205bfb506f Add Shell::$plugin and update getOptionParser()
Adding a plugin property allows the correct
usage/help information to be generated.

Fixes #2359
2011-12-10 21:31:21 -05:00
José Lorenzo Rodríguez
47b2f3e70c Merge pull request #371 from shama/patch-caketestsuite
Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile
2011-12-10 10:57:08 -08:00
Kyle Robinson Young
17fcd0534f Fix spacing for coding standards 2011-12-10 09:06:59 -08:00
Jose Lorenzo Rodriguez
cf03b33a0d Properly using sort() before asserting values, asserting the result of sort() is cheating :P 2011-12-10 10:38:24 -04:30
Ceeram
1eb55bc201 ensure test pass when files are returned in different order 2011-12-10 14:26:14 +01:00
José Lorenzo Rodríguez
039e041665 Merge pull request #370 from shama/patch-foldertree-test
Add test case for Folder::tree with hidden files
2011-12-10 00:45:45 -08:00
Kyle Robinson Young
7fa1984a43 Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile 2011-12-09 23:27:17 -08:00
Kyle Robinson Young
97fbcd1079 Add test case for Folder::tree with hidden files 2011-12-09 21:44:15 -08:00
mark_story
c3f17c24f3 Fix issue with duplicate prefixes.
Postgres::truncate() was double prefixing
table names.

Fixes #2355
2011-12-09 21:14:57 -05:00
ADmad
f367249bdb Fixing visibility keyword for constructor 2011-12-09 14:08:20 +05:30