Jose Lorenzo Rodriguez
febf28f34b
Merge remote-tracking branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/templates/default/views/home.ctp
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/media.test.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/test_app/views/pages/home.ctp
lib/Cake/Cache/Engine/ApcEngine.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04: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
Florian Krmer
585160300a
Fixing loading of plugin tests by adding Inflector::camelize()
2011-05-19 22:12:15 +02: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
Jose Lorenzo Rodriguez
27463da5ef
Fixing fixture loading in plugins
2011-05-17 17:11:34 -04:30
AD7six
7a430a921e
Merge branch 'feature/faster-tests' into 2.0
2011-05-16 16:41:12 +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
95da598d99
also check for "binary"
2011-05-15 11:29:12 +02:00
AD7six
13488fe373
using memory db tables makes tests which use a db a lot faster.
...
a *lot* faster
2011-05-15 11:29:12 +02:00
Jose Lorenzo Rodriguez
d24aca34f1
Replacing more string to match new paths
2011-05-13 03:31:12 -04:30
Jose Lorenzo Rodriguez
d83555cc52
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.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/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
0263ffc74e
Renaming tests folders and making tests runnable again
2011-04-10 20:08:24 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
5725a23a56
use the domain cake_developer and cake_error as appropriate
2011-03-19 18:35:14 +01:00
AD7six
26038b13e1
translation changes in the TestSuite dir
2011-03-12 20:02:18 +01:00
Jose Lorenzo Rodriguez
96fa5e79ba
Fixing fixture loading after recent changes in App::core()
2011-03-12 00:27:50 -04:30
Jose Lorenzo Rodriguez
42b3f993b9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-01 23:04:52 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
b2ad8fe113
Removing constant TEST_CAKE_CORE_INCLUDE_PATH
2010-12-19 23:33:37 -04:30
José Lorenzo Rodríguez
8e5bd76752
Fixing several errors when running the testsuite
2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
2907765404
Replacing almost all remaining uses of App::import
2010-12-10 01:53:27 -04:30
José Lorenzo Rodríguez
848461f7a0
Making the testsuite run again
2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
4c9ad2dec8
Starting the tedious process of moving the testsuite and tests
2010-12-08 00:34:45 -04:30