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
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -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
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Rachman Chavik
aab8e98531
Configure ClassRegistry in test mode
...
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07:00
Rachman Chavik
a5ac328a71
Adding multidb fixture support
...
CakeTestFixture now has a $useDbConfig property, that is similar
to Model::useDbConfig. CakeFixtureManager now uses this property
to decide which connection to use. CakeTestFixture::$created
records datasources it was created on.
2011-11-17 11:24:45 +07:00
mark_story
13900dc75c
Starting to fix issues with PHPUnit 3.6 compatibility.
2011-11-04 22:54:08 -04:00
mark_story
b261024111
Make fixtures disable source caching.
...
Disabling source caching when using fixtures fixes
issues with test suites. Testsuites could previously have
test order errors caused by differences in cached and un-cached sources listings.
Fixes #1942
2011-10-11 22:10:09 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
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
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
Jose Lorenzo Rodriguez
d24aca34f1
Replacing more string to match new paths
2011-05-13 03:31:12 -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
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
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