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
dereuromark
dd245747e8
merge configs instead of overriding them completely
2011-03-29 04:39:35 +02:00
Ceeram
d0e574cbba
added extra tests for changed view file extension
2011-03-25 23:27:42 -04:00
mark_story
6fd5ff34a0
Fixing incorrect test case. Thanks to hiromi2424 for pointing out the mistake.
2011-03-14 21:13:24 -04:00
José Lorenzo Rodríguez
33cbdefd8c
Moving config tests assets and adding missing view path in View tests case
2011-01-30 23:39:07 -04:30
José Lorenzo Rodríguez
aa18cca1c3
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
Juan Basso
175e008308
Reading configuration using reader classes. You can pass the key configFile in Html settings to load in constructor.
2011-01-23 19:27:50 -02:00
Juan Basso
1a90bf7292
Support to read ini files without section in IniReader.
2011-01-23 19:26:13 -02:00
Juan Basso
09fbaaaab4
Removing extra param in internacionalization.
2011-01-19 10:08:35 -02:00
mark_story
ef77e60cb0
Removing @subpackage tags, moving contents of @subpackage into @package.
...
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
José Lorenzo Rodríguez
5efa201b9b
Moving recently created files into the new folders
2010-12-18 21:52:03 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
Jeremy Harris
b9143dc7d4
Added ControllerTestCase class for testing controllers. Fixes #1244
2010-12-14 19:58:27 -08:00
mark_story
d14d148948
Making scaffold form view names consistent with those used in bake.
...
Renaming test_app files.
Fixes #501
2010-12-12 13:18:28 -05:00
mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
mark_story
d7e62b88bc
Adding test cases for using helpers in nested elements from email
...
templates. Closes #1355
2010-12-09 22:34:20 -05:00
mark_story
a830632071
Changing View::element() to not overwrite viewVars with helpers that
...
have the same name.
Test added.
Fixes #1354
2010-12-09 22:06:23 -05:00
José Lorenzo Rodríguez
4a287faa1e
Moving the tests folder
2010-12-08 01:36:38 -04:30
mark_story
55e06ec244
Merge branch '2.0-config' into 2.0
...
Conflicts:
cake/libs/configure.php
2010-12-05 23:00:05 -05:00
Juan Basso
c52d5320c8
Replaced the *printf with i18n aliases by i18n aliases with params.
2010-12-04 23:37:13 -02:00
mark_story
159f25ff0f
Adding ini file and more tests for types.
2010-12-04 12:58:02 -05:00
mark_story
26980c23ba
Adding file that was omitted from previous commits.
2010-12-04 12:56:13 -05:00
mark_story
fdb5955d6c
Adding PhpReader to implement php file reading as per #1334
2010-12-02 23:06:08 -05:00
mark_story
4c0fd76a2e
Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.
2010-11-07 13:23:45 -05:00
mark_story
bff711e2dc
Merge branch '2.0-console' into 2.0
...
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
2010-11-02 23:49:19 -04:00
Mark Story
08e7bcb7ab
Merge branch '1.3' into integration
...
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Graham Weldon
d3e0ddbb0e
Update copyright years.
2010-10-25 07:58:22 +11:00
mark_story
a72d6da9c3
Making plugin schema tests less likely to stomp on tables they shouldn't be changing.
2010-10-23 00:54:39 -04:00
mark_story
52d958d1ca
Removing .DS_Store file that was accidentally commited.
2010-10-17 18:21:37 -04:00
mark_story
14820fe03f
Moving more vendors/shells into console dirs.
2010-10-17 16:16:20 -04:00
mark_story
5737cf7877
Making TaskCollection use App::import instead of goofy shell paths.
...
Moving files in the testsuite around to reflect changed paths.
2010-10-17 15:58:44 -04:00
mark_story
f19e3d501c
Merge branch '1.3' into integration
...
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
3ab77017ae
Fixing OpenTest license mentions to use MIT License
...
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d
Changing the @license tag on test files, as tests can now be MIT like
...
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
06ed3a96a7
Moving the plugin import tests to a separate method.
...
Adding tests for importing a pluginAppHelper.
Closes #1111
2010-09-26 12:30:12 -04:00
mark_story
843ada240a
Removing AppController from ErrorHandler test as it can make testing harder.
...
Removing broken buffering from tests that trigger errors / exceptions.
Adding a loadHelper() to the test_app layout so the layout always has the required helper.
2010-09-25 10:41:08 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4
Removing all uses of the test_suite connection in the test cases
2010-09-24 23:30:01 -04:00
mark_story
2385747899
Some more fixes to make tests run better under all tests.
2010-09-24 23:28:49 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
1eb746bf7e
Fixing fatal error caused by missing argument.
2010-09-18 11:10:35 -04:00
mark_story
285876c7e7
Adding po files omitted from previous commit. Refs #1085
2010-09-14 21:16:57 -04:00
Mark Story
c8ad4f11eb
Updating test session classes to not use static methods.
2010-09-06 01:11:54 -04:00
mark_story
6c87a026b6
Updating base class.
2010-08-26 23:24:32 -04:00
mark_story
19e301c867
Updating test view to use correct helper syntax.
2010-08-26 23:19:20 -04:00
mark_story
cb3c7feb5c
Adding test file to test loading.
2010-08-10 23:18:41 -04:00
mark_story
a857e4505c
Adding files from previous commit.
2010-07-27 22:27:43 -04:00
mark_story
43127caad2
Making Cache::write() trigger warnings when a cache engine returns false from a write. Tests added. Fixes #877
2010-07-23 21:40:57 -04:00
mark_story
cd8dff362d
Merge branch '2.0-phpunit' into 2.0
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
Juan Basso
2a4489cdf2
Naming conventions to datasources with plugins. Fixes #819
2010-06-20 23:53:54 -03:00
