X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCGI%2Ft%2Fform.t;h=dd8338c596f899ae89c933520c4817a2c2c0d3ff;hb=f5f48b4d8916a5316bf55ddba4047be421aaecfe;hp=612e2e165017e7f38f53466aff5d952e29c23299;hpb=3acbd4f53b544ab36759ef8cf0a6fcc4f696a8d0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/CGI/t/form.t b/lib/CGI/t/form.t
index 612e2e1..dd8338c 100755
--- a/lib/CGI/t/form.t
+++ b/lib/CGI/t/form.t
@@ -1,16 +1,8 @@
 #!/usr/local/bin/perl -w
 
-BEGIN {
-	chdir 't' if -d 't';
-	if ($ENV{PERL_CORE}) {
-		@INC = '../lib';
-	} else {
-		# Due to a bug in older versions of MakeMaker & Test::Harness,
-	        # we must ensure the blib's are in @INC, else we might use
-	        # the core CGI.pm
-		unshift @INC, qw( ../blib/lib ../blib/arch ../lib );
-	}
-}
+# Due to a bug in older versions of MakeMaker & Test::Harness, we must
+# ensure the blib's are in @INC, else we might use the core CGI.pm
+use lib qw(. ./blib/lib ./blib/arch);
 
 use Test::More tests => 17;
 
@@ -37,47 +29,47 @@ $ENV{SERVER_PORT}     = 8080;
 $ENV{SERVER_NAME}     = 'the.good.ship.lollypop.com';
 
 is(start_form(-action=>'foobar',-method=>'get'),
-   qq(<form method="get" action="foobar" enctype="application/x-www-form-urlencoded">\n),
+   qq(<form method="get" action="foobar" enctype="multipart/form-data">\n),
    "start_form()");
 
 is(submit(),
-   qq(<input type="submit" name=".submit" />),
+   qq(<input type="submit" tabindex="1" name=".submit" />),
    "submit()");
 
 is(submit(-name  => 'foo',
 	  -value => 'bar'),
-   qq(<input type="submit" name="foo" value="bar" />),
+   qq(<input type="submit" tabindex="2" name="foo" value="bar" />),
    "submit(-name,-value)");
 
 is(submit({-name  => 'foo',
 	   -value => 'bar'}),
-   qq(<input type="submit" name="foo" value="bar" />),
+   qq(<input type="submit" tabindex="3" name="foo" value="bar" />),
    "submit({-name,-value})");
 
 is(textfield(-name => 'weather'),
-   qq(<input type="text" name="weather" value="dull" />),
+   qq(<input type="text" name="weather" tabindex="4" value="dull" />),
    "textfield({-name})");
 
 is(textfield(-name  => 'weather',
 	     -value => 'nice'),
-   qq(<input type="text" name="weather" value="dull" />),
+   qq(<input type="text" name="weather" tabindex="5" value="dull" />),
    "textfield({-name,-value})");
 
 is(textfield(-name     => 'weather',
 	     -value    => 'nice',
 	     -override => 1),
-   qq(<input type="text" name="weather" value="nice" />),
+   qq(<input type="text" name="weather" tabindex="6" value="nice" />),
    "textfield({-name,-value,-override})");
 
 is(checkbox(-name  => 'weather',
 	    -value => 'nice'),
-   qq(<input type="checkbox" name="weather" value="nice" />weather),
+   qq(<label><input type="checkbox" name="weather" value="nice" tabindex="7" />weather</label>),
    "checkbox()");
 
 is(checkbox(-name  => 'weather',
 	    -value => 'nice',
 	    -label => 'forecast'),
-   qq(<input type="checkbox" name="weather" value="nice" />forecast),
+   qq(<label><input type="checkbox" name="weather" value="nice" tabindex="8" />forecast</label>),
    "checkbox()");
 
 is(checkbox(-name     => 'weather',
@@ -85,50 +77,43 @@ is(checkbox(-name     => 'weather',
 	    -label    => 'forecast',
 	    -checked  => 1,
 	    -override => 1),
-   qq(<input type="checkbox" name="weather" value="nice" checked="1" />forecast),
+   qq(<label><input type="checkbox" name="weather" value="nice" tabindex="9" checked="checked" />forecast</label>),
    "checkbox()");
 
 is(checkbox(-name  => 'weather',
 	    -value => 'dull',
 	    -label => 'forecast'),
-   qq(<input type="checkbox" name="weather" value="dull" checked="1" />forecast),
+   qq(<label><input type="checkbox" name="weather" value="dull" tabindex="10" checked="checked" />forecast</label>),
    "checkbox()");
 
 is(radio_group(-name => 'game'),
-   qq(<input type="radio" name="game" value="chess" checked="1" />chess ).
-   qq(<input type="radio" name="game" value="checkers" />checkers),
+   qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="11" />chess</label> <label><input type="radio" name="game" value="checkers" tabindex="12" />checkers</label>),
    'radio_group()');
 
 is(radio_group(-name   => 'game',
 	       -labels => {'chess' => 'ping pong'}),
-   qq(<input type="radio" name="game" value="chess" checked="1" />ping pong ).
-   qq(<input type="radio" name="game" value="checkers" />checkers),
+   qq(<label><input type="radio" name="game" value="chess" checked="checked" tabindex="13" />ping pong</label> <label><input type="radio" name="game" value="checkers" tabindex="14" />checkers</label>),
    'radio_group()');
 
 is(checkbox_group(-name   => 'game',
 		  -Values => [qw/checkers chess cribbage/]),
-   qq(<input type="checkbox" name="game" value="checkers" checked="1" />checkers ).
-   qq(<input type="checkbox" name="game" value="chess" checked="1" />chess ).
-   qq(<input type="checkbox" name="game" value="cribbage" />cribbage),
+   qq(<label><input type="checkbox" name="game" value="checkers" checked="checked" tabindex="15" />checkers</label> <label><input type="checkbox" name="game" value="chess" checked="checked" tabindex="16" />chess</label> <label><input type="checkbox" name="game" value="cribbage" tabindex="17" />cribbage</label>),
    'checkbox_group()');
 
 is(checkbox_group(-name       => 'game',
 		  '-values'   => [qw/checkers chess cribbage/],
-		  '-defaults' => ['cribbage'],-override=>1),
-   qq(<input type="checkbox" name="game" value="checkers" />checkers ).
-   qq(<input type="checkbox" name="game" value="chess" />chess ).
-   qq(<input type="checkbox" name="game" value="cribbage" checked="1" />cribbage),
+		  '-defaults' => ['cribbage'],
+		  -override=>1),
+   qq(<label><input type="checkbox" name="game" value="checkers" tabindex="18" />checkers</label> <label><input type="checkbox" name="game" value="chess" tabindex="19" />chess</label> <label><input type="checkbox" name="game" value="cribbage" checked="checked" tabindex="20" />cribbage</label>),
    'checkbox_group()');
 
 is(popup_menu(-name     => 'game',
 	      '-values' => [qw/checkers chess cribbage/],
 	      -default  => 'cribbage',
-	      -override => 1)."\n",
-   <<END, 'checkbox_group()');
-<select name="game">
-<option  value="checkers">checkers</option>
-<option  value="chess">chess</option>
-<option  selected="1" value="cribbage">cribbage</option>
-</select>
-END
-
+	      -override => 1),
+   '<select name="game" tabindex="21">
+<option value="checkers">checkers</option>
+<option value="chess">chess</option>
+<option selected="selected" value="cribbage">cribbage</option>
+</select>',
+   'popup_menu()');