X-Git-Url: http://git.shiar.net/perl/html-form-simple.git/blobdiff_plain/d5415f8292000c0eba35458ce61500eaff9cd4d1..bb5bd81e03c47ff9cc779c5109bd6e042219a1f8:/t/html.t

diff --git a/t/html.t b/t/html.t
index b7568b0..2fea804 100644
--- a/t/html.t
+++ b/t/html.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More;
 
-plan tests => 47;
+plan tests => 55;
 
 use_ok('HTML::Form::Simple');
 
@@ -52,7 +52,42 @@ is(
 	'hidden'
 );
 
-#TODO: hidden options
+is(
+	$form->hidden(undef, undef, {value => 'bar', name => 'foo', id => 'foo'}),
+	'<input id="foo" name="foo" type="hidden" value="bar">',
+	'hidden options'
+);
+
+is_deeply(
+	[ $form->hidden(foo => [1, 0], {class => 'test'}) ],
+	[
+		'<input class="test" name="foo" type="hidden" value="1">',
+		'<input class="test" name="foo" type="hidden" value="0">',
+	],
+	'hidden array'
+);
+
+is_deeply(
+	[ $form->hidden({2 => 0, 10 => 1}, {class => 'test'}) ],
+	[
+		'<input class="test" name="10" type="hidden" value="1">',
+		'<input class="test" name="2" type="hidden" value="0">',
+	],
+	'hidden hash'
+);
+
+{
+	local $, = "\n";
+	is(
+		scalar $form->hidden({2 => [1, 0], 10 => 2}, {class => 'test'}),
+		join("\n",
+			'<input class="test" name="10" type="hidden" value="2">',
+			'<input class="test" name="2" type="hidden" value="1">',
+			'<input class="test" name="2" type="hidden" value="0">',
+		),
+		'scalar hiddens'
+	);
+}
 
 # submit
 
@@ -83,43 +118,43 @@ is(
 # input
 
 is(
-	$form->input,
+	$form->text,
 	'<input type="text">',
 	'empty input'
 );
 
 is(
-	$form->input(undef, undef, undef),
+	$form->text(undef, undef, undef),
 	'<input type="text">',
 	'explicit empty input'
 );
 
 is(
-	$form->input('test'),
+	$form->text('test'),
 	'<input id="test" name="test" type="text">',
 	'input with name'
 );
 
 is(
-	$form->input(undef, 'test'),
+	$form->text(undef, 'test'),
 	'<input type="text" value="test">',
 	'input with value'
 );
 
 is(
-	$form->input(undef, {value => 'test'}),
+	$form->text(undef, {value => 'test'}),
 	'<input type="text" value="test">',
 	'input with attribute value'
 );
 
 is(
-	$form->input({name => 'test', value => ''}),
+	$form->text({name => 'test', value => ''}),
 	'<input id="test" name="test" type="text" value="">',
 	'input with only attributes'
 );
 
 is(
-	$form->input('', '', {
+	$form->text('', '', {
 		disabled => 0,
 		something => undef,
 		class => undef,
@@ -132,31 +167,31 @@ is(
 );
 
 is(
-	$form->input(undef, undef, {name => '0', value => '0'}),
+	$form->text(undef, undef, {name => '0', value => '0'}),
 	'<input id="0" name="0" type="text" value="0">',
 	'input overrides'
 );
 
 is(
-	$form->input('name', {id => ''}),
+	$form->text('name', {id => ''}),
 	'<input name="name" type="text">',
 	'input with id override'
 );
 
 is(
-	$form->input('<">', '<">', {id => '>"<'}),
+	$form->text('<">', '<">', {id => '>"<'}),
 	'<input id=">&quot;&lt;" name="&lt;&quot;>" type="text" value="&lt;&quot;>">',
 	'input quoting'
 );
 
 is(
-	$form->input(undef, {disabled => 'something'}),
+	$form->text(undef, {disabled => 'something'}),
 	'<input disabled type="text">',
 	'disabled input'
 );
 
 is(
-	$form->input({type => 'password'}),
+	$form->text({type => 'password'}),
 	'<input type="password">',
 	'password'
 );
@@ -164,19 +199,19 @@ is(
 # textarea
 
 is(
-	$form->input({rows => 0}),
+	$form->text({rows => 0}),
 	'<textarea rows="0"></textarea>',
 	'minimal textarea'
 );
 
 is(
-	$form->input(foo => 'bar', {cols => 42, rows => 1, disabled => 1}),
+	$form->text(foo => 'bar', {cols => 42, rows => 1, disabled => 1}),
 	'<textarea disabled cols="42" id="foo" name="foo" rows="1">bar</textarea>',
 	'textarea'
 );
 
 is(
-	$form->input(undef, qq{<foo>&bl'a"\n    .}, {cols => undef, rows => '<">'}),
+	$form->text(undef, qq{<foo>&bl'a"\n    .}, {cols => undef, rows => '<">'}),
 	qq{<textarea rows="&lt;&quot;>">&lt;foo>&amp;bl'a&quot;\n    .</textarea>},
 	'textarea quoting'
 );
@@ -282,7 +317,7 @@ is(
 );
 
 is(
-	$form->radio(foo => undef, [2]), #TODO
+	$form->radio(foo => undef, 2),
 	'<input id="foo_2" name="foo" type="radio" value="2">',
 	'labelless radio'
 );
@@ -330,28 +365,62 @@ is(
 );
 
 is(
-	$form->check(foo => 'test', {value => undef}),
-	'<label><input id="foo" name="foo" type="checkbox"> test</label>',
-	'check parameters'
+	$form->check(foo => '<">'),
+	'<label><input id="foo_1" name="foo" type="checkbox" value="1"> <"></label>',
+	'labeled checkbox'
 );
 
 is(
-	$form->check(undef, '', 1),
-	'<input checked type="checkbox" value="1">',
-	'simple checkbox'
+	$form->check(foo => {label => 'test', value => undef}, {disabled => 1}),
+	'<label><input disabled id="foo" name="foo" type="checkbox"> test</label>',
+	'check parameters'
+);
+
+is_deeply(
+	[ $form->check(undef, '', 1) ],
+	[ '<input checked type="checkbox" value="1">' ],
+	'anonymous checkbox'
 );
 
-TODO: {
-	local $TODO = 'shorthand';
 is_deeply(
 	[ $form->check(undef, ['', '<">']) ],
 	[
-		'<input checked type="checkbox" value="1">',
-		'<label><input checked type="checkbox" value="2"> &lt;&quot;></label>',
+		'<input type="checkbox" value="1">',
+		'<label><input type="checkbox" value="2"> <"></label>',
 	],
 	'multiple checkboxes'
 );
-};
+
+is_deeply(
+	[ $form->check(undef, [{}, undef], 1) ],
+	[
+		'<input checked type="checkbox" value="1">',
+		'<input checked type="checkbox" value="2">',
+	],
+	'multiple checked checkboxes'
+);
+
+{
+	local $, = ' | ';
+	is(
+		scalar $form->check(foo => [1, 0], {value => 0}),
+		join(' | ',
+			'<label><input id="foo_1" name="foo" type="checkbox" value="1"> 1</label>',
+			'<label><input id="foo_2" name="foo" type="checkbox" value="2"> 0</label>',
+		),
+		'merged checkboxes'
+	);
+}
+
+is_deeply(
+	[ $form->check(undef, [{value => 4, type => 'radio'}], [1, 0, 0], {value => 3}) ],
+	[
+		'<input checked type="radio" value="4">',
+		'<input type="checkbox" value="2">',
+		'<input checked type="checkbox" value="3">',
+	],
+	'various checkboxes'
+);
 
 #TODO