X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F107_no_auto_help.t;h=989e81dfc087c762efdea85ebe5178e262c6e49d;hb=986fb4690bc00c860b1f728b986e39b412100854;hp=a45ef523df209fbd73d122a7fd0ea5630fa8431e;hpb=739ba280e7e594c7e27162f5b40599f7b90463f2;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
index a45ef52..989e81d 100644
--- a/t/107_no_auto_help.t
+++ b/t/107_no_auto_help.t
@@ -8,11 +8,20 @@
 # getoptions() will not call into pod2usage() (causing program termination)
 # when --help is passed (and MooseX::ConfigFromFile is in use).
 
+use strict;
+use warnings FATAL => 'all';
+
+use Test::Requires { 'MooseX::SimpleConfig' => 0.07 };  # skip all if not installed
+use Test::More tests => 2;
+use Test::Warn 0.21;
+use Test::Fatal 0.003;
+
+use Test::Warnings;
 
 my $fail_on_exit = 1;
 {
     package Class;
-    use strict; use warnings;
+    use strict; use warnings FATAL => 'all';
 
     use Moose;
     with
@@ -30,23 +39,14 @@ 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;
-
 END {
     ok(!$fail_on_exit, 'getoptions() lives');
 
-    # cancel the non-zero exit status from _getopt_full_usage()
+    # cancel the non-zero exit status from print_usage_text()
     exit 0;
 }
 
@@ -54,8 +54,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$/,