improved grammar in test notes; use fixed test count when not skipping tests

[gitmo/MooseX-Getopt.git] / t / 107_no_auto_help.t

diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
index a45ef52..c958257 100644 (file)
--- a/t/107_no_auto_help.t
+++ b/t/107_no_auto_help.t
@@ -7,7 +7,18 @@
 # 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;
+
+BEGIN {
+    if (eval { require MooseX::SimpleConfig and MooseX::SimpleConfig->VERSION(0.07) }) {
+        plan tests => 3;
+    } else {
+        plan skip_all => 'This test needs MooseX::SimpleConfig 0.07';
+    }
+}
 
 my $fail_on_exit = 1;
 {
@@ -30,16 +41,10 @@ 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;
 
@@ -55,7 +60,8 @@ END {
 
 warning_like {
     throws_ok { Class->new_with_options }
-        qr/^usage: [\d\w]+\Q.t [long options...]\E.\t--configfile\s*.\t--help/ms,
+           #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$/,