X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate%2Funit_core_script_server.t;h=c4d3c5bf80cb1d136cde583b48d360cc5e49528a;hp=7cd6fb4986e9d578e5bc3ddc1cf962e69db19606;hb=7064f69b1dfb59d1f3bad647b2097d0320acce8a;hpb=2a1acc71ae813ba9ca5b63a3c65c70fde941c319

diff --git a/t/aggregate/unit_core_script_server.t b/t/aggregate/unit_core_script_server.t
index 7cd6fb4..c4d3c5b 100644
--- a/t/aggregate/unit_core_script_server.t
+++ b/t/aggregate/unit_core_script_server.t
@@ -25,22 +25,22 @@ testOption( [ qw// ], ['3000', undef, opthash()] );
 # help           -? -help --help           -? --help
 # debug          -d -debug --debug         -d --debug
 # host           -host --host              --host
-testOption( [ qw/--host testhost/ ], ['3000', 'testhost', opthash()] );
-testOption( [ qw/-h testhost/ ], ['3000', 'testhost', opthash()] );
+testOption( [ qw/--host testhost/ ], ['3000', 'testhost', opthash(host => 'testhost')] );
+testOption( [ qw/-h testhost/ ], ['3000', 'testhost', opthash(host => 'testhost')] );
 
 # port           -p -port --port           -l --listen
-testOption( [ qw/-p 3001/ ], ['3001', undef, opthash()] );
-testOption( [ qw/--port 3001/ ], ['3001', undef, opthash()] );
+testOption( [ qw/-p 3001/ ], ['3001', undef, opthash(port => 3001)] );
+testOption( [ qw/--port 3001/ ], ['3001', undef, opthash(port => 3001)] );
 {
     local $ENV{TESTAPPTOTESTSCRIPTS_PORT} = 5000;
-    testOption( [ qw// ], [5000, undef, opthash()] );
+    testOption( [ qw// ], [5000, undef, opthash(port => 5000)] );
 }
 {
     local $ENV{CATALYST_PORT} = 5000;
-    testOption( [ qw// ], [5000, undef, opthash()] );
+    testOption( [ qw// ], [5000, undef, opthash(port => 5000)] );
 }
 
-if (try { require Starman; 1; }) {
+if (try { require Plack::Handler::Starman; 1; }) {
     # fork           -f -fork --fork           -f --fork
     testOption( [ qw/--fork/ ], ['3000', undef, opthash(fork => 1)] );
     testOption( [ qw/-f/ ], ['3000', undef, opthash(fork => 1)] );
@@ -52,7 +52,7 @@ if (try { require MooseX::Daemonize; 1; }) {
     testOption( [ qw/--pid cat.pid/ ], ['3000', undef, opthash(pidfile => "cat.pid")] );
 }
 
-if (try { require Starman; 1; }) {
+if (try { require Plack::Handler::Starman; 1; }) {
     # keepalive      -k -keepalive --keepalive -k --keepalive
     testOption( [ qw/-k/ ], ['3000', undef, opthash(keepalive => 1)] );
     testOption( [ qw/--keepalive/ ], ['3000', undef, opthash(keepalive => 1)] );
@@ -127,9 +127,9 @@ sub testOption {
     $run_args[-1]->{pidfile} = $run_args[-1]->{pidfile}->file->stringify
       if scalar(@run_args) && $run_args[-1]->{pidfile};
 
-
     # Mangle argv into the options..
     $resultarray->[-1]->{argv} = $argstring;
+    $resultarray->[-1]->{extra_argv} = [];
     is_deeply \@run_args, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
 }
 
@@ -151,7 +151,7 @@ sub testBackgroundOptionWithFork {
 
     ## Check a few args
     is_deeply $app->{ARGV}, $argstring;
-    is $app->{port}, '3000';
+    is $app->port, '3000';
     is($app->{background}, 1);
 }
 
@@ -190,6 +190,8 @@ sub opthash {
         'follow_symlinks' => 0,
         'background' => 0,
         'keepalive' => 0,
+        port => 3000,
+        host => undef,
         @_,
     };
 }