die with our own die method whenever possible #80

Author: simbabque

.gitignore

@@ -19,3 +19,4 @@ tidyall.ERR
 /WWW-Mechanize-*/
 /WWW-Mechanize-*.tar.gz
 /.vscode
+/cover_db

Changes

@@ -4,6 +4,8 @@ Revision history for WWW::Mechanize
     [ENHANCEMENTS]
     - mech_dump now treats all local files like HTML regardless of what it
       thinks their content types are (GH#63) (Julien Fiegehenn)
+    - We now consistently use our own die() method and therefore the onerror
+      handler wherever possible (GH#80) (Julien Fiegehenn)
 
 2.12      2022-07-20 06:45:40Z
 

lib/WWW/Mechanize.pm

@@ -1711,7 +1711,7 @@ Selects a form by passing in a list of field names it must contain.  All matchin
 
 sub all_forms_with_fields {
     my ($self, @fields) = @_;
-    die 'no fields provided' unless scalar @fields;
+    $self->die('no fields provided') unless scalar @fields;
 
     my @matches;
     FORMS: for my $form (@{ $self->forms }) {
@@ -1754,7 +1754,7 @@ Note that this functionality requires libwww-perl 5.69 or higher.
 
 sub form_with_fields {
     my ($self, @fields) = @_;
-    die 'no fields provided' unless scalar @fields;
+    $self->die('no fields provided') unless scalar @fields;
 
     my $nth;
     if ( @fields > 1 && ref $fields[-1] eq 'HASH' ) {
@@ -2506,7 +2506,6 @@ sub submit_form {
 
     my @filtered_sets;
     if ( $args{with_fields} ) {
-        $fields || die q{must submit some 'fields' with with_fields};
         my @got = $self->all_forms_with_fields(keys %{$fields});
         $self->die("There is no form with the requested fields") if not @got;
         push @filtered_sets, \@got;
@@ -2536,7 +2535,7 @@ sub submit_form {
         # Assume that each filtered set only has a given form object once.
         # So we can count occurrences.
         #
-        tie my %c, 'Tie::RefHash' or die;
+        tie my %c, 'Tie::RefHash' or $self->die('Cannot determine a form to use');
         foreach (@filtered_sets) {
             foreach (@$_) {
                 ++$c{$_};
@@ -2938,7 +2937,7 @@ sub request {
     my $self = shift;
     my $request = shift;
 
-    _die( '->request was called without a request parameter' )
+    $self->die( '->request was called without a request parameter' )
         unless $request;
 
     $request = $self->_modify_request( $request );
@@ -3171,7 +3170,7 @@ sub _taintedness {
     }
 
     # Sanity check
-    die "Our taintbrush should have zero length!" if length $_taintbrush;
+    die("Our taintbrush should have zero length!") if length $_taintbrush;
 
     return $_taintbrush;
 }

t/content.t

@@ -1,6 +1,7 @@
 use warnings;
 use strict;
-use Test::More tests => 9;
+use Test::More;
+use Test::Exception;
 
 =head1 NAME
 
@@ -51,6 +52,8 @@ SKIP: {
     unlike( $text, qr/html/i, 'Could not find "html"' );
 }
 
+dies_ok { $mech->content(format => 'no_such_format' ) } 'Unkown format';
+
 =head2 $mech->content(base_href => undef)
 
 =head2 $mech->content(base_href => $basehref)
@@ -79,6 +82,10 @@ is($content, 'this is a slightly decoded content', 'decoded_by_headers => 1');
 $content = $mech->content(charset => 'whatever');
 is($content, 'this is charset whatever', 'charset => ...');
 
+dies_ok { $mech->content(unhandled => 'param') } 'unhandled param';
+
+done_testing;
+
 package Test::MockResponse;
 
 sub new {

t/credentials.t

@@ -4,7 +4,8 @@ use warnings;
 use strict;
 
 use WWW::Mechanize;
-use Test::More tests => 14;
+use Test::More;
+use Test::Fatal;
 
 my $mech = WWW::Mechanize->new;
 isa_ok( $mech, 'WWW::Mechanize' );
@@ -17,6 +18,13 @@ my $uri = URI->new( 'http://localhost' );
 is $user, undef, 'default username is undefined at first';
 is $pass, undef, 'default password is undefined at first';
 
+like(
+    exception {
+        $mech->credentials("one", "two", "three");
+    },
+    qr/Invalid # of args for overridden credentials/,
+    'credentials dies with wrong number of args'
+);
 
 $mech->credentials("username", "password");
 
@@ -52,3 +60,5 @@ is $user, 'username',
    'cloned object still has username for get_basic_credentials';
 is $pass, 'password',
    'cloned object still has password for get_basic_credentials';
+
+done_testing;

t/form_with_fields.html

@@ -48,7 +48,7 @@
     <input type="hidden" name="5e" value="value" />
 </form>
 
-<form action="http://localhost/" method="post" name="6th_form">
+<form action="http://localhost/" method="post" name="6th_form" id="6th_form">
     <select name="select">
         <option value="one">Option 1</option>
         <option value="two">Option 2</option>

t/local/click_button.t

@@ -18,6 +18,8 @@ isa_ok( $mech, 'WWW::Mechanize', 'Created the object' );
 my $server = LocalServer->spawn();
 isa_ok( $server, 'LocalServer' );
 
+dies_ok { $mech->click_button( id => 0 ) } 'Dies without a form';
+
 my $response = $mech->get( $server->url );
 isa_ok( $response, 'HTTP::Response', 'Got back a response' );
 ok( $response->is_success, 'Got URL' ) or die q{Can't even fetch local url};

t/local/follow.t

@@ -1,6 +1,7 @@
 use warnings;
 use strict;
-use Test::More tests => 28;
+use Test::More;
+use Test::Exception;
 use lib 't/local';
 use LocalServer;
 
@@ -60,3 +61,6 @@ is( $agent->uri, $server->url, 'Needs to be on the same page' );
 eval {$agent->follow_link( '/foo' )};
 like($@, qr/Needs to get key-value pairs of parameters.*follow\.t/, "Invalid parameter passing gets better error message");
 
+dies_ok { WWW::Mechanize->new->follow_link( url => '/404' ) } "dies when link does not exist with autocheck";
+
+done_testing;

t/local/select_multiple.t

@@ -1,6 +1,7 @@
 use warnings;
 use strict;
 use Test::More;
+use Test::Exception;
 
 use lib 't/local';
 use LocalServer;
@@ -34,6 +35,9 @@ HTML
 my $server = LocalServer->spawn( html => $html );
 isa_ok( $server, "LocalServer" );
 
+dies_ok { $mech->submit_form( form_number => 1, fields => { none => 0 } ) }
+'Dies without a form';
+
 $mech->get($server->url);
 ok( $mech->success, 'Fetched OK' );
 

t/submit_form.t

@@ -27,6 +27,19 @@ $mech->get($uri);
     );
 }
 
+{
+    $mech->get($uri);
+    is(
+        exception {
+            $mech->submit_form(
+                form_id => '6th_form',
+            );
+        },
+        undef,
+        'submit_form with valid form_id',
+    );
+}
+
 {
     $mech->get($uri);
     like(
@@ -91,4 +104,17 @@ $mech->get($uri);
     );
 }
 
+{
+    $mech->get($uri);
+    like(
+        exception {
+            $mech->submit_form(
+                with_fields => {}, # left empty on purpose
+            )
+        },
+        qr/no fields provided/,
+        'submit_form with no fields',
+    );
+}
+
 done_testing();