X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F107_no_auto_help.t;h=f25278009d12df73661e6b79ea5c250f8ad435ef;hb=8582c92478a98d290912f5ed3f0171a7049ed05c;hp=a45ef523df209fbd73d122a7fd0ea5630fa8431e;hpb=84a583159f38ec9a0149efdbc392edb774680fab;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
index a45ef52..f252780 100644
--- a/t/107_no_auto_help.t
+++ b/t/107_no_auto_help.t
@@ -7,7 +7,14 @@
 # Summary: If we disable the "auto_help" option in Getopt::Long, then
 # getoptions() will not call into pod2usage() (causing program termination)
 # when --help is passed (and MooseX::ConfigFromFile is in use).
+use strict;
+use warnings;
 
+use Test::More;
+
+use Test::Requires {
+    'MooseX::SimpleConfig' => 0.07, # skip all if not installed
+};
 
 my $fail_on_exit = 1;
 {
@@ -30,22 +37,18 @@ my $fail_on_exit = 1;
         },
     );
 
-    # only here to avoid an "unknown option: help" warning
-    has help => (
-        is => 'ro', isa => 'Bool',
-    );
-
     no Moose;
     1;
 }
 
-use Test::More tests => 3;
-use Test::Warn;
-use Test::Exception;
+use Test::Warn 0.21;
+use Test::Fatal 0.003;
 
 END {
     ok(!$fail_on_exit, 'getoptions() lives');
 
+    done_testing;
+
     # cancel the non-zero exit status from _getopt_full_usage()
     exit 0;
 }
@@ -54,8 +57,9 @@ END {
 @ARGV = ('--help');
 
 warning_like {
-    throws_ok { Class->new_with_options }
-        qr/^usage: [\d\w]+\Q.t [long options...]\E.\t--configfile\s*.\t--help/ms,
+    like exception { Class->new_with_options },
+           #usage: 107_no_auto_help.t [-?] [long options...]
+        qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --usage --help  Prints this usage information.\E.\s+--configfile/ms,
         'usage information looks good';
     }
     qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/,