X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_script_server.t;h=f298fa9a202645a4b51043f64c62800518eca3e3;hb=b376e4ecc15edbb0abeb1276710e8da7826daa82;hp=25084527bc0c68151462aa96224b3f686ea9e4be;hpb=d5c1270360c155009fa138b6f0630044304f3c86;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_script_server.t b/t/aggregate/unit_core_script_server.t
index 2508452..f298fa9 100644
--- a/t/aggregate/unit_core_script_server.t
+++ b/t/aggregate/unit_core_script_server.t
@@ -79,6 +79,19 @@ testRestart( ['-r', '--restart_directory', 'root'], restartopthash(directories =
 testRestart( ['-r', '--rr', 'foo'], restartopthash(filter => qr/foo/) );
 testRestart( ['-r', '--restart_regex', 'foo'], restartopthash(filter => qr/foo/) );
 
+local $ENV{TESTAPPTOTESTSCRIPTS_RESTARTER};
+local $ENV{CATALYST_RESTARTER};
+{
+    is _build_testapp([])->restarter_class, 'Catalyst::Restarter', 'default restarter with no $ENV{CATALYST_RESTARTER}';
+}
+{
+    local $ENV{CATALYST_RESTARTER} = "CatalystX::Restarter::Other";
+    is _build_testapp([])->restarter_class, $ENV{CATALYST_RESTARTER}, 'override restarter with $ENV{CATALYST_RESTARTER}';
+}
+{
+    local $ENV{TESTAPPTOTESTSCRIPTS_RESTARTER} = "CatalystX::Restarter::Other2";
+    is _build_testapp([])->restarter_class, $ENV{TESTAPPTOTESTSCRIPTS_RESTARTER}, 'override restarter with $ENV{TESTAPPTOTESTSCRIPTS_RESTARTER}';
+}
 done_testing;
 
 sub testOption {
@@ -89,8 +102,8 @@ sub testOption {
     };
     # First element of RUN_ARGS will be the script name, which we don't care about
     shift @TestAppToTestScripts::RUN_ARGS;
-    my $server = shift @TestAppToTestScripts::RUN_ARGS;
-    like ref($server), qr/^Plack::Server/, 'Is a Plack Server';
+    my $server = pop @TestAppToTestScripts::RUN_ARGS;
+    like ref($server), qr/^Plack::Handler/, 'Is a Plack::Handler';
     # Mangle argv into the options..
     $resultarray->[-1]->{argv} = $argstring;
     is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
@@ -132,8 +145,13 @@ sub opthash {
 }
 
 sub restartopthash {
-    return {
-        follow_symlinks => 0,
-        @_,
+    my $opthash = opthash(@_);
+    my $val = {
+        application_name => 'TestAppToTestScripts',
+        port => '3000',
+        debug => undef,
+        host => undef,
+        %$opthash,
     };
+    return $val;
 }