merged conflicts

[catagits/Catalyst-Runtime.git] / t / aggregate / unit_core_engine_fixenv-lighttpd.t

diff --git a/t/aggregate/unit_core_engine_fixenv-lighttpd.t b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
index eeb0ca0..51456a5 100644 (file)
--- a/t/aggregate/unit_core_engine_fixenv-lighttpd.t
+++ b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
@@ -1,5 +1,3 @@
-#!perl
-
 use strict;
 use warnings;
 
@@ -38,7 +36,7 @@ sub fix_env {
     my (%input_env) = @_;
 
     my $mangled_env;
-    my $app = Catalyst->_wrapped_legacy_psgi_app(sub {
+    my $app = Catalyst->apply_default_middlewares(sub {
         my ($env) = @_;
         $mangled_env = $env;
         return [ 200, ['Content-Type' => 'text/plain'], [''] ];
@@ -51,6 +49,7 @@ sub fix_env {
 my %fixed_env = fix_env(%env);
 
 is($fixed_env{PATH_INFO}, '/bar', 'check PATH_INFO');
-ok(!exists($fixed_env{SCRIPT_NAME}), 'check SCRIPT_NAME');
+ok(!exists($fixed_env{SCRIPT_NAME}) || !length($fixed_env{SCRIPT_NAME}),
+    'check SCRIPT_NAME');
 
 done_testing;