allow undef files when Content is present

This commit bumps HTML::Form to 6.08 to fix a bug that would not allow
us to set the content from a header without the file argument present.

It also fixes another bug where the code blew up if a non-existent field
was requested.

Author: simbabque

Changes

@@ -1,6 +1,12 @@
 Revision history for WWW::Mechanize
 
 {{$NEXT}}
+    [FIXED]
+    - File upload fields now correctly handle overwriting the file name and
+      passing in content without a real file (GH#249) (Gil Magno and Julien
+      Fiegehenn)
+    - HTML::Form bumped to 6.08 (GH#347) (Julien Fiegehenn)
+
     [ENHANCEMENTS]
     - Add autocheck() to enable or disable autochecking at run time in
       addition to setting it at object creation (GH#232) (Julien Fiegehenn)

dist.ini

@@ -24,6 +24,7 @@ dir = script
 
 [Prereqs / RuntimeRequires]
 perl = 5.006
+HTML::Form = 6.08
 Scalar::Util = 1.14
 
 [Prereqs / TestRequires]

lib/WWW/Mechanize.pm

@@ -1901,6 +1901,8 @@ These methods allow you to set the values of fields in a given form.
 
 =head2 $mech->field( $name, \@values, $number )
 
+=head2 $mech->field( $name, \@file_upload_values, $number )
+
 Given the name of a field, set its value to the value specified.
 This applies to the current form (as set by the
 C<L<< form_name()|/"$mech->form_name( $name [, \%args ] )" >>> or
@@ -1914,16 +1916,17 @@ If the field is of type "file", its value should be an arrayref. Example:
 Value examples for "file" inputs, followed by explanation of what each
 index mean:
 
+    # 0: filepath      1: filename    3: headers
     ['/tmp/file.txt']
     ['/tmp/file.txt', 'filename.txt']
     ['/tmp/file.txt', 'filename.txt', @headers]
     ['/tmp/file.txt', 'filename.txt', Content => 'some content']
     [undef,           'filename.txt', Content => 'content here']
 
-Index 0 is the filepath that will be read from disk. Index 1 is the
+Index 0 is the I<filepath> that will be read from disk. Index 1 is the
 filename which will be used in the HTTP request body; if not given,
-filepath (index 0) is used instead. If "Content => 'content here'" is
-informed as shown, then filepath will be ignored.
+filepath (index 0) is used instead. If C<<Content => 'content here'>> is
+used as shown, then I<filepath> will be ignored.
 
 The optional C<$number> parameter is used to distinguish between two fields
 with the same name.  The fields are numbered from 1.
@@ -2059,6 +2062,8 @@ sub select {
 
 =head2 $mech->set_fields( $name => \$value_instance_number )
 
+=head2 $mech->set_fields( $name => \@file_upload )
+
 This method sets multiple fields of the current form. It takes a list
 of field name and value pairs. If there is more than one field with
 the same name, the first one found is set. If you want to select which
@@ -2108,7 +2113,7 @@ sub set_fields {
         my $number = 1;
 
         if ( ref $value eq 'ARRAY' ) {
-            my $input = $form->find_input($field);
+            my $input = $form->find_input($field) or next FIELD;
 
             # Honor &submit_form's documentation, that says that a
             # "file" input's value can be in the form of

t/file_upload.t

@@ -1,16 +1,27 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Exception;
 use WWW::Mechanize;
 use URI::file;
 
 my $file     = 't/file_upload.html';
 my $filename = 'the_file_upload.html';
 my $mc = WWW::Mechanize->new;
 my $uri = URI::file->new_abs( 't/file_upload.html' )->as_string;
-my ($form, $input);
+my ($form, $input, $as_string);
 
 # &field
+$mc->get( $uri );
+$mc->field( 'document', [$file] );
+($form) = $mc->forms;
+$as_string = $form->make_request->as_string;
+like( $as_string, qr! filename="$file" !x,
+      q/$mc->field( 'document', [$file] )/ );
+like(
+    $as_string, qr!<form method="post" enctype="multipart/form-data"!,
+    '... and the file was sent'
+);
 
 $mc->get( $uri );
 $mc->field( 'document', [$file, $filename] );
@@ -19,24 +30,46 @@ like( $form->make_request->as_string, qr! filename="$filename" !x,
       q/$mc->field( 'document', [$file, $filename] )/ );
 
 $mc->get( $uri );
-$mc->field( 'document', [$file, $filename, Content => 'content'] );
+$mc->field( 'document', [$file, $filename, Content => 'changed content'] );
 ($form) = $mc->forms;
-like( $form->make_request->as_string, qr! filename="$filename" !x,
-      q/$mc->field( 'document', [$file, $filename, Content => 'content'] )/ );
+$as_string = $form->make_request->as_string;
+like( $as_string, qr! filename="$filename" !x,
+      q/$mc->field( 'document', [$file, $filename, Content => 'changed content'] )/ );
+like(
+    $as_string, qr!changed content!,
+    '... and the Content header was sent instead of the file'
+);
+
 
 # &set_fields
 
+$mc->get( $uri );
+$mc->set_fields( 'document' => [$file] );
+($form) = $mc->forms;
+$as_string = $form->make_request->as_string;
+like( $as_string, qr! filename="$file" !x,
+      q/$mc->set_fields( 'document', [$file] )/ );
+like(
+    $as_string, qr!<form method="post" enctype="multipart/form-data"!,
+    '... and the file was sent'
+);
+
 $mc->get( $uri );
 $mc->set_fields( 'document' => [ $file, $filename ] );
 ($form) = $mc->forms;
 like( $form->make_request->as_string, qr! filename="$filename" !x,
       q/$mc->set_fields( 'document' => [ $file, $filename ] )/ );
 
 $mc->get( $uri );
-$mc->set_fields( 'document' => [ $file, $filename, Content => 'content' ] );
+$mc->set_fields( 'document' => [ $file, $filename, Content => 'my content' ] );
 ($form) = $mc->forms;
-like( $form->make_request->as_string, qr! filename="$filename" !x,
-      q/$mc->set_fields( 'document' => [ $file, $filename, Content => 'content' ] )/ );
+$as_string = $form->make_request->as_string;
+like( $as_string, qr! filename="$filename" !x,
+      q/$mc->set_fields( 'document' => [ $file, $filename, Content => 'my content' ] )/ );
+like(
+    $as_string, qr!my content!,
+    '... and the Content header was sent instead of the file'
+);
 
 $mc->get( $uri );
 $mc->set_fields( 'document' => [[ $file, $filename ], 1] );
@@ -51,4 +84,21 @@ $mc->set_fields
 like( $form->make_request->as_string, qr! filename="$filename" !x,
       q/$mc->set_fields( 'document' => [[ $file, $filename, Content => 'content' ], 1] )/ );
 
+$mc->get( $uri );
+$mc->set_fields
+  ( 'document' => [[ undef, $filename, Content => 'content' ], 1] );
+($form) = $mc->forms;
+$as_string = $form->make_request->as_string;
+like( $as_string, qr! filename="$filename" !x,
+      q/$mc->set_fields( 'document' => [[ undef, $filename, Content => 'content' ], 1] )/ );
+
+# field does not exist
+$mc->get( $uri );
+lives_ok { $mc->set_fields( 'does_not_exist' => [ [$file], 1 ] ) }
+'setting a field that does not exist lives';
+($form) = $mc->forms;
+$as_string = $form->make_request->as_string;
+unlike( $as_string, qr! filename="$file" !x,
+      q/$mc->set_fields( 'does_not_exist' => [ [$file], 1 ] )/ );
+
 done_testing;