X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_env.t;h=ecc2a0bdde1062d515ec421ac39d83ec3084b5e2;hb=ancona-trace;hp=30066a40868cf2418788baa3eb7617c20e0dfc6d;hpb=6e3f9d973268bf6e117dcb0a5d775de61e22c418;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t
index 30066a4..ecc2a0b 100644
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -1,5 +1,3 @@
-#!perl
-
 use strict;
 use warnings;
 
@@ -13,8 +11,7 @@ use vars qw/
 
 BEGIN {
     $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 
-    $EXPECTED_ENV_VAL = $ENV{$EXPECTED_ENV_VAR}
-         = "Test env value " . rand(100000);
+    $EXPECTED_ENV_VAL = "Test env value " . rand(100000);
 }
 
 use Test::More;
@@ -24,18 +21,19 @@ use Catalyst::Request;
 use HTTP::Headers;
 use HTTP::Request::Common;
 
-plan skip_all => 'Does not work in live tests' if ( $ENV{CATALYST_SERVER} );
-
-{
-    my $env;
+foreach my $path (qw/ env env_on_engine /) {
+    my $response = request("http://localhost/dump/${path}", {
+        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' );
+
+    my $env;
     ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' );
     is ref($env), 'HASH';
-    ok exists($env->{PATH}), 'Have a PATH env var';
+    ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var for ' . $path;
 
     SKIP:
     {
@@ -43,7 +41,7 @@ plan skip_all => 'Does not work in live tests' if ( $ENV{CATALYST_SERVER} );
             skip 'Using remote server', 1;
         }
         is $env->{$EXPECTED_ENV_VAR}, $EXPECTED_ENV_VAL,
-            'Value we set as expected';
+            'Value we set as expected for ' . $path;
     }
 }