X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_engine_fixenv-lighttpd.t;h=9c71ddb422024fd067dbd711548bcb034fa19ecd;hb=73cfe9caf8ca1424c2bfe56d948a8c49a623fba9;hp=ea54e88de3eea9fb9339f65a04e389ab4ba1930a;hpb=ce616b55dfe42513400a5881614da857a7d6d767;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_engine_fixenv-lighttpd.t b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
index ea54e88..9c71ddb 100644
--- a/t/aggregate/unit_core_engine_fixenv-lighttpd.t
+++ b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
@@ -5,14 +5,7 @@ use warnings;
 
 use Test::More;
 
-plan skip_all => 'Known broken currently';
-
-eval "use FCGI";
-plan skip_all => 'FCGI required' if $@;
-
-plan tests => 2;
-
-require Catalyst::Engine::FastCGI;
+use Catalyst ();
 
 my %env = (
     'SCRIPT_NAME'          => '/bar',
@@ -41,8 +34,24 @@ my %env = (
     'HTTP_HOST'            => 'localhost:8000',
 );
 
-Catalyst::Engine::FastCGI->_fix_env(\%env);
+sub fix_env {
+    my (%input_env) = @_;
+
+    my $mangled_env;
+    my $app = Catalyst->apply_default_middlewares(sub {
+        my ($env) = @_;
+        $mangled_env = $env;
+        return [ 200, ['Content-Type' => 'text/plain'], [''] ];
+    });
+
+    $app->({ %input_env, 'psgi.url_scheme' => 'http' });
+    return %{ $mangled_env };
+}
+
+my %fixed_env = fix_env(%env);
 
-is($env{PATH_INFO}, '/bar', 'check PATH_INFO');
-ok(!exists($env{SCRIPT_NAME}), 'check SCRIPT_NAME');
+is($fixed_env{PATH_INFO}, '/bar', 'check PATH_INFO');
+ok(!exists($fixed_env{SCRIPT_NAME}) || !length($fixed_env{SCRIPT_NAME}),
+    'check SCRIPT_NAME');
 
+done_testing;