Commit graph

125 commits

Author SHA1 Message Date
mark_story
de57802f05 Fixing left over action from previos refactoring of viewClass/view. 2011-03-07 21:50:53 -05:00
mark_story
dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
mark_story
0f4c90588d Fixing issue where elements did not get .ctp as a fallback extension unlike view and layout files.
Adding a protected method to get extensions, as it would be in 3 places now.
Added tests.
Fixes #1438
2011-01-12 20:43:41 -05: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
mark_story
e20ea8ad72 Renaming Dispatcher::__loadRoutes -> Dispatcher::_loadRoutes to match naming conventions.
Updating method name usage, as assertType is deprecated as of PHPUnit 3.5.6
2010-12-24 12:54:04 -05:00
mark_story
f85567a566 Removing @author tags that snuck in. 2010-12-21 21:58:20 -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
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
mark_story
9b08b725fe Merge branch '2.0' into 2.0-view
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
mark_story
f4b0ec1d20 Updating E_STRICT issues in view test.
Removing dead methods and classes.
2010-11-10 23:40:56 -05:00
mark_story
1f5999f388 Adding some tests for element caching. 2010-11-09 22:31:05 -05:00
mark_story
1cf5e72054 Removing duplicated calls to slug()
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
mark_story
dfefc2d97b Very initial pass at getting elements cached with Cache. Refs #1268 2010-11-08 00:06:10 -05:00
mark_story
a9a9bc0e2e Removing bogus crud in the test. 2010-11-07 23:48:14 -05:00
mark_story
f7f9c3f6a2 Removing a test case that doesn't need to exist anymore as the conditions for cache generation are now in CacheHelper. 2010-11-07 13:23:44 -05:00
mark_story
2e140a9fd3 Adding tests for element callbacks. 2010-11-07 13:23:43 -05:00
mark_story
76919902b9 Removing direct tests of protected method.
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149 Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks.
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
2010-11-07 13:23:42 -05: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
0761edecfb Making the cake:nocache stripping more relaxed so that if either condition to enable caching is on, tags will be stripped. Tests added. Fixes #1148 2010-09-28 23:03:56 -04:00
mark_story
6d7f2d37ab Fixing issue where fields with the exact same name as the model would result in incorrect name attributes. Tests added. Fixes #1123 2010-09-26 00:46:51 -04:00
mark_story
92b57d81ee Moving common setup and teardown functionality in to CakeTestCase.
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00
mark_story
24dd0af601 Adding debug backup for view test. 2010-09-25 10:50:35 -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
e91fa68f8e Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105 2010-09-18 00:13:03 -04:00
mark_story
003d02d8d9 Making view test pass by moving property assignment on mock. 2010-09-13 23:11:59 -04:00
mark_story
e4b2fb173b Removing the deprecated properties.
Removing property copying to helpers.
Making the view test cases pass again.
2010-09-13 23:11:59 -04:00
mark_story
d8b2bcdf06 Making view + helpers groups pass. 2010-08-28 00:40:12 -04:00
mark_story
4cc2229641 Updating CacheHelper to use correct View API.
Updating View to make CacheHelper tests pass.
2010-08-26 23:24:09 -04:00
mark_story
087ccabffe Starting to modify Helper constructors. 2010-08-10 23:18:37 -04:00
mark_story
1d983e1cd4 Making MissingView and MissingLayout cake errors into exceptions. 2010-08-10 23:18:37 -04:00
mark_story
a23207791a Modifying View to accept HelperCollection. Removing methods that are no longer needed. 2010-08-10 23:18:37 -04:00
mark_story
c15d228515 Initial integration of HelperCollection into View. 2010-08-10 23:18:37 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
94965f0f6c Adding an additional test for View::entity().
Fixing issue where nulls would be shifted onto the entity array causing incorrect name attributes.  Fixes #867
2010-06-28 21:38:17 -04:00
José Lorenzo Rodríguez
ae4f3b24d8 Moving logic from methods that will be probably deprecated 2010-05-31 22:24:53 -04:30
José Lorenzo Rodríguez
0743cee22f Migrating ViewTest to phpunit 2010-05-31 22:15:03 -04:30
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
José Lorenzo Rodríguez
8c3df122eb Merge commit 'lorenzo/2.0-phpunit' into 2.0-phpunit
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
	cake/tests/lib/test_manager.php
2010-05-12 23:58:56 -04:30
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
José Lorenzo Rodríguez
d252fdeb52 Fixing View test case to be compatible with PHPUnit 2010-05-09 16:09:02 -04:30
Mark Story
a17a38ddf4 Fixing fatal errors in View test.
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -04:00
predominant
51d71b4541 Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests. 2010-04-05 21:15:17 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00