Ceeram
92c00e115e
Merge branch '1.3' of git://github.com/cakephp/cakephp into 1.3
2011-05-18 10:17:44 +02:00
Thomas Ploch
bf721668e5
Merge branch '1.3' of https://github.com/cakephp/cakephp into 1.3-bake
2011-05-18 08:06:30 +02:00
Mark Story
c30ba40bd5
Merge pull request #79 from tPl0ch/2.0-errorhandler-rewrite
...
Rewrite of Fix for Ticket #1707 .
2011-05-17 17:34:21 -07:00
José Lorenzo Rodríguez
b22c29cabe
Merge pull request #82 from sitedyno/2.0-pages-dir
...
2.0 pages dir
2011-05-17 16:25:34 -07:00
AD7six
245d678eda
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
...
Conflicts:
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
2011-05-18 01:01:31 +02:00
AD7six
b1d891bb49
path correction
2011-05-18 01:00:00 +02:00
Heath Nail
930ef89f8c
Pages directory should be capitalized.
2011-05-17 18:37:12 -04:00
Jose Lorenzo Rodriguez
27463da5ef
Fixing fixture loading in plugins
2011-05-17 17:11:34 -04:30
AD7six
6e29bb4d94
fix ModelIntegrationTest part 1
2011-05-17 21:48:16 +02:00
José Lorenzo Rodríguez
ce774c0083
Merge pull request #81 from sitedyno/2.0-corePath-regex
...
2.0 core path regex
2011-05-17 11:53:38 -07:00
Heath Nail
dc85d21f05
Dots appear in the text searched for, added to search pattern.
...
The define statement in skel/webroot/index.php contains dots. Added \.
to the search pattern so that bake will update the core path in
webroot/index.php
2011-05-17 14:34:10 -04:00
Jose Lorenzo Rodriguez
f645db61fb
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-05-17 12:45:45 -04:30
Jose Lorenzo Rodriguez
12e7347272
Fixing Scaffold tests
2011-05-17 12:44:38 -04:30
AD7six
83e7028ecd
fix multibyte test case
...
put the mb_internal_encoding call in a file which is _always_ loaded
2011-05-17 18:41:35 +02:00
Renan Gonçalves aka renan.saddam
9b9339354a
Merge pull request #80 from evilbloodydemon/1.3-fix
...
Fixed undefined variable
2011-05-17 04:35:19 -07:00
evilbloodydemon
5abd00e636
Fixed undefined variable
2011-05-17 15:29:21 +04:00
AD7six
d3772fc605
Revert "prevent requesting a folder (/css) from showing a dir listing"
...
This reverts commit 1bdff8f63c
.
Disappointinly, it broke my apache test install
2011-05-17 09:37:29 +02:00
AD7six
1bdff8f63c
prevent requesting a folder (/css) from showing a dir listing
...
most likely users do not want this - so just remove it. If it is desired
it's very easy to add back
2011-05-17 09:32:14 +02:00
Thomas Ploch
d8a614e112
Added usage of configured error handler instead of hard coded. Moved try/catch block to where its nessecary. Set Configure::write('Error.trace', false) since its useless with internals. Addition to #1707 .
2011-05-17 08:44:55 +02:00
Jose Lorenzo Rodriguez
1b14887e3a
Fixing all helpers tests after massing search and replace that broke parameter order on assertTags()
2011-05-17 00:06:22 -04:30
Jose Lorenzo Rodriguez
217e9e0330
Fixing test in I18n due to case sensitivity problems
2011-05-16 23:58:18 -04:30
Jose Lorenzo Rodriguez
ef663f7d3f
Fixing more tests after the massive search and replace
2011-05-16 23:53:30 -04:30
Jose Lorenzo Rodriguez
7ef1a2995a
Fixing failing tests due to massive search and replace
2011-05-16 23:45:35 -04:30
mark_story
cd13e37609
Adding tests for previous commit.
...
Refs #1678
2011-05-16 21:12:28 -04:00
mark_story
2bc58a5abd
Added check if Router::getRequest(false) is returning a CakeRequest or null in ExceptionRenderer::_getController(). Fixes 'call to undefined method here()' when having Exceptions raised without valid request set to the Router in testsuite (i.e. undefined database config 'test'). Fixes #1678 .
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
2011-05-16 21:11:33 -04:00
Thomas Ploch
085c621c0e
Added try/catch block into ErrorHandler::handleException() to gracefully show Exceptions raised during exception handling. Fixes #1707
2011-05-16 20:53:38 -04:00
mark_story
6289f20b83
Fixing Router::reverse() serializing all of _Token.
...
Removing CSRF tokens from the parameters SecurityComponent exports.
Updating tests for both Router and SecurityComponent.
Fixes #1697
2011-05-16 20:35:27 -04:00
AD7six
f2e953d892
Correct bad comparision
...
I can't be sure the result is correct - but the existing expected result
is identical to the input string. Which cannot be correct
test now passes
2011-05-17 00:54:13 +02:00
AD7six
0a53242e3e
correcting all the inverted assertEqual tests
...
$expected is the first argument. Now certain test results start to make
sense:
1) MultibyteTest::testUsingMbStrtolower
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
AD7six
e24ef781e5
one less scaffold fail..
2011-05-17 00:31:59 +02:00
Thomas Ploch
bf37054bca
Fixed wrong passing of $expected and $results in model task test.
2011-05-17 00:29:58 +02:00
AD7six
48ce54afec
case fixes
2011-05-17 00:25:16 +02:00
AD7six
6695994cc2
case fixes
2011-05-17 00:23:58 +02:00
AD7six
e7c8dd1616
$expected is the first arg for assertEqual
2011-05-17 00:23:09 +02:00
AD7six
1e6acec2ab
case correction
2011-05-17 00:22:19 +02:00
AD7six
6b77e73c49
$expected is the first arg for assertEqual
...
having it the wrong way round makes the error messages quite confusing
2011-05-17 00:20:59 +02:00
AD7six
e95d6a3b10
case correction, fixes ExceptionRenderer test
2011-05-17 00:08:51 +02:00
AD7six
d63b4df10c
ensure consistent order for loaded function
...
Fixes the test case
2011-05-17 00:01:20 +02:00
AD7six
20f541108e
partial fix for the scaffold test
2011-05-16 23:50:42 +02:00
AD7six
eafc8259e5
case correction
2011-05-16 23:38:28 +02:00
AD7six
40b29855a5
case corrections
2011-05-16 23:36:55 +02:00
AD7six
3fc785d823
fix case for viewPath.
2011-05-16 23:32:59 +02:00
AD7six
183b2ea9fc
correct for case fixes the ProjectTask test case
2011-05-16 23:29:59 +02:00
AD7six
245c207096
case fix for SchemaShell test
2011-05-16 23:17:29 +02:00
AD7six
fe2ec74b0e
correct paths to Config dir
2011-05-16 21:52:25 +02:00
Renan Gonçalves
f3bd0faa94
Fixing typo on the documentation. Patch by mamchenkov.
2011-05-16 21:14:46 +02:00
Renan Gonçalves aka renan.saddam
8c28df7b9b
Merge pull request #78 from mamchenkov/2.0
...
Documentation typo fix for branch 2.0
2011-05-16 12:11:27 -07:00
Leonid Mamchenkov
574cee7510
Fixed typo in documentation
2011-05-16 21:58:18 +03:00
Graham Weldon
21f35345fa
Merge remote-tracking branch 'burzum/2.0' into 2.0
2011-05-17 01:51:42 +10:00
AD7six
7a430a921e
Merge branch 'feature/faster-tests' into 2.0
2011-05-16 16:41:12 +02:00