mark_story
efbb6479fc
Fixing issues in DboSource::group(), which always expected an optional argument.
...
Fixes #1656
2011-05-20 21:10:30 -04:00
Jose Lorenzo Rodriguez
85c505fd4f
Fixing recently broken tests
2011-05-19 21:35:51 -04:30
Jose Lorenzo Rodriguez
38ad1bfc62
Revert "Update App::objects() cache after App::build()."
...
This reverts commit f9b02dde44
.
2011-05-19 21:31:02 -04:30
Ceeram
104f6a52fd
Merge branch '1.3' into 1.3-1679
2011-05-20 00:35:51 +02:00
Ceeram
548f09c39b
Merge branch '1.3' of git://github.com/cakephp/cakephp into 1.3
2011-05-20 00:06:39 +02:00
José Lorenzo Rodríguez
a718b1d91c
Merge pull request #89 from sitedyno/2.0-cakeplugin-tests
...
2.0 cakeplugin tests
2011-05-19 14:05:18 -07:00
Heath Nail
f9b02dde44
Update App::objects() cache after App::build().
...
Prevents console from crashing because it would try to load test plugins
(from object cache) that it didn't know how to find.
2011-05-19 16:55:01 -04:00
José Lorenzo Rodríguez
0cb0b0636d
Merge pull request #88 from burzum/585160300a174ab4d91a1fff01f586ff80306093
...
2.0 Fixing loading of plugin tests by adding Inflector::camelize()
2011-05-19 13:42:56 -07:00
Heath Nail
4ccf5c0885
Clear application plugins before running the first test.
2011-05-19 16:26:49 -04:00
Heath Nail
a7ec73b523
Update the object cache.
...
Keep application plugins out of core tests, otherwise tests will fail.
2011-05-19 16:25:25 -04:00
Florian Krmer
585160300a
Fixing loading of plugin tests by adding Inflector::camelize()
2011-05-19 22:12:15 +02:00
Renan Gonçalves aka renan.saddam
6f2e8092f1
Merge pull request #86 from sitedyno/2.0-plugintask
...
2.0 plugintask
2011-05-19 11:44:43 -07:00
Heath Nail
e645fa7340
Make baked plugin directories consistent with 2.0 conventions.
2011-05-19 13:06:12 -04:00
José Lorenzo Rodríguez
4d35d634c8
Merge pull request #85 from sitedyno/2.0-appshell
...
2.0 appshell
2011-05-19 08:08:57 -07:00
José Lorenzo Rodríguez
a19ff8e20f
Merge pull request #84 from tPl0ch/2.0-testloader
...
Adding a failsafe plugin load in tests case runner so it is possible to run tests on plugins that have not been loaded in bootstrap
2011-05-18 23:07:55 -07:00
Heath Nail
eecd91e99f
Load AppShell class.
2011-05-18 21:05:21 -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
Thomas Ploch
35a014045b
Moved check for CakePlugin::loaded() out of if statement in CakeTestLoader::_basePath(). Plugin will only be loaded when the plugin tests are requested.
2011-05-18 17:15:39 +02:00
José Lorenzo Rodríguez
b3e1c2a9ee
Merge pull request #83 from tPl0ch/2.0-testloader
...
Fixed small typo in CakeTestLoader.php
2011-05-18 07:52:05 -07:00
Thomas Ploch
2b17988cb7
Fixed small typo in CakeTestLoader.php.
2011-05-18 16:14:36 +02:00
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