Tidy up help and TODO tests

diff --git a/TODO.scripts b/TODO.scripts
deleted file mode 100644 (file)
index 7e779d7..0000000
--- a/TODO.scripts
+++ /dev/null
@@ -1 +0,0 @@
-* Fix TODO tests

diff --git a/lib/Catalyst/Script/CGI.pm b/lib/Catalyst/Script/CGI.pm
index 2fd965c..c37dfdc 100644 (file)
--- a/lib/Catalyst/Script/CGI.pm
+++ b/lib/Catalyst/Script/CGI.pm
@@ -5,8 +5,6 @@ use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
-__PACKAGE__->meta->get_attribute('help')->cmd_aliases('h');
-
 __PACKAGE__->meta->make_immutable;
 
 =head1 NAME

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index ab85ded..361aa26 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -5,8 +5,6 @@ use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
-__PACKAGE__->meta->get_attribute('help')->cmd_aliases('h');
-
 has force => (
     traits => [qw(Getopt)],
     cmd_aliases => 'nonew',

diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index ba7f096..11bc735 100644 (file)
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -7,8 +7,6 @@ use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
-__PACKAGE__->meta->get_attribute('help')->cmd_aliases('h');
-
 has listen => (
     traits => [qw(Getopt)],
     cmd_aliases => 'l',

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index ef1f818..22bafcb 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -11,6 +11,8 @@ use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
+__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?');
+
 has debug => (
     traits => [qw(Getopt)],
     cmd_aliases => 'd',

diff --git a/lib/Catalyst/Script/Test.pm b/lib/Catalyst/Script/Test.pm
index 1416bd4..268b1cd 100644 (file)
--- a/lib/Catalyst/Script/Test.pm
+++ b/lib/Catalyst/Script/Test.pm
@@ -5,8 +5,6 @@ use namespace::autoclean;
 
 with 'Catalyst::ScriptRole';
 
-__PACKAGE__->meta->get_attribute('help')->cmd_aliases('h');
-
 sub run {
     my $self = shift;
 

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index bef547a..089f2df 100644 (file)
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -25,6 +25,7 @@ has help => (
     isa => Bool,
     is => 'ro',
     documentation => q{Display this help and exit},
+    cmd_aliases => ['?', 'h'],
 );
 
 sub _getopt_spec_exception {}

diff --git a/t/aggregate/unit_core_script_help.t b/t/aggregate/unit_core_script_help.t
index 2b6530a..0287990 100644 (file)
--- a/t/aggregate/unit_core_script_help.t
+++ b/t/aggregate/unit_core_script_help.t
@@ -11,26 +11,21 @@ use lib "$Bin/../lib";
     package TestHelpScript;
     use Moose;
     with 'Catalyst::ScriptRole';
-    __PACKAGE__->meta->get_attribute('help')->cmd_aliases('h');
     our $help;
-    sub _exit_with_usage { $help++ }
+    sub _getopt_full_usage { $help++ }
 }
 
 test('-h');
 test('--help');
-
-TODO: {
-    local $TODO = 'This is bork';
-    test('-?');
-}
+test('-?');
 
 sub test {
     local $TestHelpScript::help;
     local @ARGV = (@_);
     lives_ok {
         TestHelpScript->new_with_options(application_name => 'TestAppToTestScripts')->run;
-    };
-    ok $TestHelpScript::help;
+    } 'Lives';
+    ok $TestHelpScript::help, 'Got help';
 }
 
 done_testing;