X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_env.t;h=59a22198ae68d5148c4c062f10ee920d579dd5c8;hb=fb34eb9c063c53abd061d260a30f0ca7c57a0833;hp=6763b1416b8dc6eefdb96db3b86c2548d260b6a0;hpb=220bf857ab697651a59738aa34c9e110f6af486a;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t
index 6763b14..59a2219 100644
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -12,9 +12,8 @@ use vars qw/
 /;
 
 BEGIN {
-    $EXPECTED_ENV_VAR = "CatalystTest$$";
-    $EXPECTED_ENV_VAL = $ENV{$EXPECTED_ENV_VAR}
-         = "Test env value " . rand(100000);
+    $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 
+    $EXPECTED_ENV_VAL = "Test env value " . rand(100000);
 }
 
 use Test::More tests => 7;
@@ -25,15 +24,18 @@ use HTTP::Headers;
 use HTTP::Request::Common;
 
 {
-    my $env;
+    my $response = request("http://localhost/dump/env", {
+        extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL },
+    });
 
-    ok( my $response = request("http://localhost/dump/env"),
-        'Request' );
+    ok( $response, 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    ok( eval '$env = TestApp->engine->env', 'engine->env is defined' );
-    is( ref($env), 'HASH', 'engine->env is a hash' );
-    ok exists($env->{PATH}), 'Have a PATH env var';
+
+    my $env;
+    ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' );
+    is ref($env), 'HASH';
+    ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var';
 
     SKIP:
     {