Commit graph

86 commits

Author SHA1 Message Date
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Kyle Robinson Young
99793fd654 Test case compatibility skipUnless() to markTestSkipped() 2011-11-16 21:07:09 -05:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
fb7d931bef Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Jose Lorenzo Rodriguez
7658af354c Removing var_dump from test cases 2011-11-13 19:54:07 -04:30
mark_story
0a0a09920b Updating for PHP5.4
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
mark_story
92688e2a49 Fix keying in SessionHelper::flash()
It shouldb e looking for the plugin in the params key.  This
makes SessionHelper compatible with SessionComponent.
2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591 Fix session flash with plugins.
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
2011-11-12 11:03:17 -05:00
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
Ceeram
cfbc6d4989 adding extra test, disproves ticket [#2233 state:works-for-me] 2011-11-08 20:29:33 +01:00
Kyle Robinson Young
1b95b01265 Fix docblock formatting with Time Helper Test 2011-11-07 22:16:55 -08:00
ADmad
e1354b2ee6 Merge branch '2.0' into 2.1 2011-11-06 20:39:08 +05:30
mark_story
bfd95d0e04 Fixing remaining failing tests in PHPUnit 3.6 2011-11-04 22:54:09 -04:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
mark_story
bcdf61a9d5 Adding escaping by default for TextHelper::autoLink()
TextHelper::autoLink, autoLinkEmails, and autoLinkUrls now all
escape HTML by default, this can be disabled using the escape => false option.

Fixes #1625
2011-10-29 12:08:43 -04:00
mark_story
ce9bb6b632 Fix validation detection in FormHelper
string values for validation means a single validation method.
That implies the field is required.

Fixes #2181
2011-10-28 21:35:43 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
m
dcc17f2091 ucfirst object names part two (Folder/File)
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-24 21:36:48 -04:00
mark_story
d6bf1479c8 Add documentation and test for FormHelper::select()
An alternate syntax was undocumented and untested.  Fix that.
Refs #1794
2011-10-23 22:27:07 -04:00
mark_story
edfb0884c8 Adding test for form->submit() and timestamps.
Conflicts:

	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2011-10-19 21:53:47 -04:00
mark_story
7f0f224c56 Fix missing preg_quote around highlight searches.
Highlight strings should be literal values not regexp fragments.
Fixes #2111

Conflicts:

	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
mark_story
3b1a11e2d2 Add a test for src and href attributes
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04:00
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
mark_story
08b974d64b Adding the _x and _y fields to the unlocked fields
for image submits.
Fixes #2032
2011-09-27 21:14:36 -04:00
Jelle Henkens
957a75c45e Removing PHP4 compatibility code
Signed-off-by: mark_story <mark@mark-story.com>
2011-09-20 21:10:32 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.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/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
mark_story
d74f442608 Making test case class names match file names.
Refs #1985
2011-09-12 23:01:04 -04:00
Jelle Henkens
236200ca56 Improved error handling for writing the test file to disk 2011-09-10 17:02:22 +01:00
Jelle Henkens
38196bda3f Adding missing test scenarios in the rss helper 2011-09-10 11:49:49 +01:00
Jelle Henkens
653163c891 Adding missing test scenarios in the paginator helper 2011-09-09 21:47:26 -04:00
mark_story
608e5ee04b Refactoring test.
Removing expectError() replacing it with PHPUnit annotation.
2011-09-09 21:43:57 -04:00
Jelle Henkens
aa4545217e Fixing test by splitting them up, testing the expected error ignored the next asserts 2011-09-09 21:40:05 -04:00
Mark Story
8880e0c668 Merge pull request #192 from jellehenkens/2.0-html-helper-tests
Added tests for the HtmlHelper for code that was not covered
2011-09-07 18:03:02 -07:00
mark_story
6ab59a447c Fix create() and onsubmit option.
Removing support for onSubmit variant.  Additional
choices are not necessary. Fixing onsubmit option
not correctly working.
Fixes #1977
2011-09-07 20:59:04 -04:00
Jelle Henkens
3c8c2936b3 Added tests to test ajax settings 2011-09-07 20:59:04 -04:00
Jelle Henkens
e6826fea21 Adding tests for HtmlHelper 2011-09-08 00:59:39 +01:00
Juan Basso
a1a049c700 Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/View/Helper/CacheHelper.php
2011-08-20 01:47:27 -04:00
Mark Story
46c07add3f Fixing issues with HTML5 number inputs and float columns.
For float columns, the default step value is 'any'
Fixes #1907
2011-08-18 22:31:00 -04:00
Mark Story
54e1de9070 Adding visibility keywords to code that came from
a 1.3 merge.
2011-08-16 22:40:38 -04:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
182b13fdbd Fixing failing test. In 2.0, absolute paths are not altered. 2011-08-14 14:49:56 -04:00
mark_story
d93c8cb200 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
5d79299362 For paging links the 'class' attribute is now always applied to the wrapping tag for consistency. Closes #1759 2011-08-14 05:09:57 +05:30
Mark Story
6026aa4019 Adding tests for FormHelper::postButton() and SecurityComponent. 2011-08-10 22:00:02 -04:00
Mark Story
2ce2d06de2 Fixing issue where postLink() would fail when used with SecurityComponent. 2011-08-10 21:53:33 -04:00
Mark Story
e9382d0897 Fixing failing tests. 2011-08-10 21:40:53 -04:00
Maggion Emmanuel
27734507e4 Adding test case 2011-08-09 20:47:25 +03:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Dean Sofer
804e88b092 Added test for HTML5 FormHelper::input() integer to number in $map 2011-07-26 02:19:41 -07:00