XXX: test update: option name override should not reset id

[perl/html-form-simple.git] / t / html.t

diff --git a/t/html.t b/t/html.t
index 89f82a1356c78e2522247c4cb9d9a3c65c1a94aa..5b3fa2a13600b6a4d136c2ecc69f0c9af305fd95 100644 (file)
--- a/t/html.t
+++ b/t/html.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More;
 
-plan tests => 65;
+plan tests => 72;
 
 use_ok('HTML::Form::Simple');
 
@@ -312,14 +312,14 @@ is_deeply(
 
 is(
        $form->radio(foo => 'test'),
-       '<label><input id="foo_1" name="foo" type="radio" value="1"> test</label>',
+       '<input id="foo_test" name="foo" type="radio" value="test">',
        'radio method'
 );
 
 is(
-       $form->radio(foo => undef, 2),
-       '<input id="foo_2" name="foo" type="radio" value="2">',
-       'labelless radio'
+       $form->radio(foo => undef, 'test'),
+       '<label><input id="foo_1" name="foo" type="radio" value="1"> test</label>',
+       'labeled radio'
 );
 
 is(
@@ -330,15 +330,33 @@ is(
 
 is_deeply(
        [ $form->radio(undef, ['', '<">']) ],
+       [
+               '<input type="radio" value="">',
+               '<input type="radio" value="&lt;&quot;>">',
+       ],
+       'multiple radios'
+);
+
+is_deeply(
+       [ $form->radio(undef, undef, ['', '<">']) ],
        [
                '<input type="radio" value="1">',
                '<label><input type="radio" value="2"> <"></label>',
        ],
-       'multiple radios'
+       'multiple radio labels'
+);
+
+is_deeply(
+       [ $form->radio(undef, [0, 1], undef, 0) ],
+       [
+               '<input checked type="radio" value="0">',
+               '<input type="radio" value="1">',
+       ],
+       'radio default'
 );
 
 is_deeply(
-       [ $form->radio(foo => 'test', ['foo', ''], {value => '', id => ''}) ],
+       [ $form->radio(foo => ['foo', ''], 'test', {value => '', id => ''}) ],
        [
                '<label><input name="foo" type="radio" value="foo"> test</label>',
                '<label><input checked name="foo" type="radio" value=""> test</label>',
@@ -347,7 +365,7 @@ is_deeply(
 );
 
 is_deeply(
-       [ $form->radio(foo => ['', 0], [0, 1, '']) ],
+       [ $form->radio(foo => [0, 1, ''], ['', 0]) ],
        [
                '<input id="foo_0" name="foo" type="radio" value="0">',
                '<label><input id="foo_1" name="foo" type="radio" value="1"> 0</label>',
@@ -358,8 +376,8 @@ is_deeply(
 
 {
        # make sure arguments aren't modified
-       my @args = (foo => [0, 1], [0, {value => 1}], {name => 0, value => 1});
-       my @orgs = (foo => [0, 1], [0, {value => 1}], {name => 0, value => 1});
+       my @args = (foo => [0, {value => 1}], [0, 1], {name => 0, value => 1});
+       my @orgs = (foo => [0, {value => 1}], [0, 1], {name => 0, value => 1});
        my @output = (
                '<label><input id="foo_0" name="foo" type="radio" value="0"> 0</label>',
                '<label><input checked id="foo_1" name="foo" type="radio" value="1"> 1</label>',
@@ -375,7 +393,7 @@ is_deeply(
                [ $form->check(@args) ],
                [
                        '<label><input checked id="foo_1" name="foo" type="checkbox" value="1"> 0</label>',
-                       '<label><input checked id="foo_2" name="foo" type="checkbox" value="2"> 1</label>',
+                       '<input checked id="foo_1" name="foo" type="checkbox" value="1">',
                ],
                'options var to check'
        );
@@ -393,13 +411,13 @@ is_deeply(
 
 is(
        $form->check('foo'),
-       '<input id="foo_1" name="foo" type="checkbox" value="1">',
+       '<input id="foo" name="foo" type="checkbox" value="1">',
        'check method'
 );
 
 is(
        $form->check(foo => '<">'),
-       '<label><input id="foo_1" name="foo" type="checkbox" value="1"> <"></label>',
+       '<label><input id="foo" name="foo" type="checkbox" value="1"> <"></label>',
        'labeled checkbox'
 );
 
@@ -415,13 +433,57 @@ is_deeply(
        'anonymous checkbox'
 );
 
+is(
+       $form->check(foo => [undef]),
+       '<input id="foo_1" name="foo" type="checkbox" value="1">',
+       'multipart check'
+);
+
+is_deeply(
+       [ $form->check(foo => [{value => undef}, undef]) ],
+       [
+               '<input id="foo" name="foo" type="checkbox">',
+               '<input id="foo_2" name="foo" type="checkbox" value="2">',
+       ],
+       'multiple checkboxes'
+);
+
+is(
+       $form->check(foo => [undef], {id => ''}),
+       '<input name="foo" type="checkbox" value="1">',
+       'idless checks'
+);
+
+is_deeply(
+       [ $form->check(
+               foo => [ {id => 'quux'}, {name => 'name'}, {value => 0}, {id => ''}, undef ], {id => 'bar'}
+       ) ],
+       [
+               '<input id="quux" name="foo" type="checkbox" value="1">',
+               '<input id="bar_2" name="name" type="checkbox" value="2">',
+               '<input id="bar_0" name="foo" type="checkbox" value="0">',
+               '<input name="foo" type="checkbox" value="4">',
+               '<input id="bar_5" name="foo" type="checkbox" value="5">',
+       ],
+       'check overrides'
+);
+
+is_deeply(
+       [ $form->check(foo => ['bar', {name => 'bar'}], {name => 'ignored'}) ],
+       [
+               '<label><input id="foo_1" name="foo" type="checkbox" value="1"> bar</label>',
+               '<input id="foo_2" name="bar" type="checkbox" value="2">',
+       ],
+       'checkbox names'
+);
+
 is_deeply(
        [ $form->check(undef, ['', '<">']) ],
        [
                '<input type="checkbox" value="1">',
                '<label><input type="checkbox" value="2"> <"></label>',
        ],
-       'multiple checkboxes'
+       'anonymous checkboxes'
 );
 
 is_deeply(
@@ -485,7 +547,7 @@ is(
 );
 
 is_deeply(
-       [ $defform->radio(0 => undef, [1, 0]) ],
+       [ $defform->radio(0 => [1, 0]) ],
        [
                '<input id="0_1" name="0" type="radio" value="1">',
                '<input checked id="0_0" name="0" type="radio" value="0">',