X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_engine_fixenv-iis6.t;h=cefcd35b79bccebe7e0e8a6f741b5a97a92d85d5;hb=a943d722ed6e624a46cc687f4bd3ae2ff096963d;hp=3b36c3e6ae28644f506a4ca8ad05a7c3d3a7059d;hpb=5d50f369bffa3625ca983b72fc8bc013c8a1e802;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_engine_fixenv-iis6.t b/t/aggregate/unit_core_engine_fixenv-iis6.t
index 3b36c3e..cefcd35 100644
--- a/t/aggregate/unit_core_engine_fixenv-iis6.t
+++ b/t/aggregate/unit_core_engine_fixenv-iis6.t
@@ -5,12 +5,7 @@ use warnings;
 
 use Test::More;
 
-eval "use FCGI";
-plan skip_all => 'FCGI required' if $@;
-
-plan tests => 2;
-
-require Catalyst::Engine::FastCGI;
+use Catalyst;
 
 my %env = (
     'SCRIPT_NAME' => '/koo/blurb',
@@ -55,8 +50,23 @@ my %env = (
     'HTTP_HOST' => '127.0.0.1:83'
 );
 
-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}, '//blurb', 'check PATH_INFO');
-is($env{SCRIPT_NAME}, '/koo', 'check SCRIPT_NAME');
+is($fixed_env{PATH_INFO}, '//blurb', 'check PATH_INFO');
+is($fixed_env{SCRIPT_NAME}, '/koo', 'check SCRIPT_NAME');
 
+done_testing;