Commit graph

81 commits

Author SHA1 Message Date
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
c47e899ba1 Fixing HtmlHelper::css, and JavascriptHelper::link so that files containing the asset extension always get the extension added. Test cases added. Refs #139 2009-10-02 12:53:20 -04:00
mark_story
508d737b6a Updating HtmlHelper::css, JavascriptHelper::link to not replace multiple occurences of CSS_URL or JS_URL when using Asset.filter settings.
Test cases added.
Thanks to 'robustsolution' for the patch.
Fixes #105
2009-09-26 14:22:12 -04:00
mark_story
ba7b2e9de6 Refactoring test cases to contain separate test methods for timestamped assets. 2009-09-24 00:28:27 -04:00
mark_story
26d2237df0 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-23 23:30:55 -04:00
ADmad
de4737323f Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-23 23:30:34 -04:00
mark_story
022f8ccaa2 Making conditions easier to read.
Adding additional test for image timestamping.
Refs #108
2009-09-22 19:04:40 -04:00
ADmad
07a89cd953 Updated Html and Javascript helpers to suffix asset urls with timestamp even when the app is run off a subfolder on the domain
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-22 18:57:30 -04:00
mark_story
ce7864920f Adding ability to add arbitrary attributes to HtmlHelper::scriptBlock. Test case added. 2009-09-03 13:50:53 -04:00
mark_story
ead3b0ecf6 Allowing HtmlHelper::script() to take an array of options, allows for custom attributes to be added to script include tags. Test cases added. Fixes #2955 2009-09-03 13:45:39 -04:00
mark_story
c963d5cc43 Updating file headers. 2009-09-03 12:43:13 -04:00
mark_story
136b4db7ad Deprecating $escape for HtmlHelper::tag() use $attributes['escape'] instead. Test case added. 2009-08-26 22:46:49 -04:00
mark_story
def4c98a08 Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/header.php
2009-07-25 17:35:27 -04:00
mark_story
2414a43c91 Adding HtmlHelper::scriptStart and HtmlHelper::scriptEnd. Further deprecates JavascriptHelper. Fixing issues in test case. 2009-07-25 15:43:26 -04:00
mark_story
4ebf5a4e32 Merge commit 'code/1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/lib/header.php
2009-07-25 01:35:36 -04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
9c51f720ed Merge branch '1.3' into jshelper-integration
Conflicts:
	cake/tests/cases/libs/view/helpers/js.test.php
2009-07-06 23:43:57 -04:00
davidpersson
68d333d088 Applying patches by ADMad updating HtmlHelper and adding test. Adding missing properties in test case. Preventing bleed through in test case. Fixes #6490
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8220 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-04 22:04:40 +00:00
gwoo
303bc0fc89 fixing up some tests. pretty much all greens for me. 2009-06-02 17:21:15 -07:00
gwoo
ec18aac4ab Merge branch 1.2 into 1.3 2009-04-15 15:16:01 -07:00
mark_story
574b0529ec Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2009-03-27 23:13:50 -04:00
davidpersson
fd7d6718a1 Updating tests to not affect other ones when run from a group
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics




git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
gwoo
643651fe56 Merge master in 1.3 2009-03-19 14:10:13 -07:00
davidpersson
3c3b852099 Changing package of tests from "cake.tests" to "cake".
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
mark_story
4b690237f0 Merge branch '1.3' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
2009-03-15 13:20:43 -04:00
mark_story
91e47a6379 Adding scriptBlock() to HtmlHelper.
Adding tests.
2009-03-12 22:59:55 -04:00
mark_story
7ea7bd90c2 Moving script() method into HtmlHelper.
Moving tests.
2009-03-12 19:51:30 -04:00
mark_story
c164be8c03 Enabling Asset.timestamp for HtmlHelper::image() making it consistent with Javascript::link().
Tests added.
Fixes #6170

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8078 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 04:40:50 +00:00
the_undefined
74bf622866 Fixes #6071
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8053 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-23 15:19:33 +00:00
mark_story
b94a85e938 Altering Helper::url() to enforce escaped query strings for generated urls.
Tests added to Html::link().  Fixes #5982

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7991 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:41:47 +00:00
TommyO
de1d1ae3bd Fixed asset.timestamp inconsistency for css files.
Added tests to confirm css linking.
Closes #5990. Fixes #5991

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7990 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:19:11 +00:00
mariano.iglesias
81e2f4a044 Fixing commit in r7843 so real files are accounted for
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7850 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:34:51 +00:00
mariano.iglesias
8777b8ef96 Fixing issue where double call to webroot on HtmlHelper::css was generating wrong URLs when forcing asset timestamp, fixes #5723
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7843 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:24:51 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
gwoo
c004dd68a5 removing empty lines from the end of test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7295 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 08:17:02 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
nate
63217b7e10 Fixing failing tests in core helper group, closes #4946
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7213 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-19 14:31:00 +00:00
AD7six
a978fb2661 adding Doc blocks to everything in tests folder missed in the first pass.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7126 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-05 15:20:45 +00:00
AD7six
f44c755475 Adding doc blocks to everything in the tests dir
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7094 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 19:22:55 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
joelmoss
17c542d76d HtmlHelper::tableCells() now accepts a fifth parameter $continueOddEven, which by default is true, thereby not affecting current behaviour. When false, $count will not be static, and will therefore start from zero, giving correct odd and even values if they are passed. Fixes #4222
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7003 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 09:13:23 +00:00
mark_story
f7438da72e Implemented patch from 'johnathansnook' closes #4496 Form::inputs now allows for fieldset classname to be set. Updated tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6991 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-21 03:57:35 +00:00
joelmoss
9a4c186ccd Html::tag now accepts $attributes as a string, in which case, it will be used as the tags class name.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6859 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 23:09:37 +00:00
joelmoss
65454882f3 Created Html::tag helper which allows you to create any HTML block tag. Html::div now uses this method.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6858 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 23:04:52 +00:00
mariano.iglesias
ce01acfbdf Reverting test change from [6790]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6799 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-11 16:39:18 +00:00
mariano.iglesias
b8f0e80f7d Fixing test cases in HtmlHelperTest for command line testing and removing function aliases from CodeCoverageManager
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6790 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-10 16:42:35 +00:00
mariano.iglesias
b32a196238 Adding more coverage for HtmlHelperTest and fixing issue where HtmlHelper::meta() was overriding the found type as specified in attribute
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6788 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-10 04:57:46 +00:00
mariano.iglesias
6eb4daccd2 Refactoring HtmlHelperTest to use assertTags, fixes #4449
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6787 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-10 04:32:55 +00:00
nate
a392e5e605 Refactoring tests and adding code coverage for HtmlHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6775 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-08 17:48:14 +00:00