[Catalyst-commits] r12593 - Catalyst-Runtime/5.80/branches/psgi/t/aggregate

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-10 04:42:21 +0000 (Sun, 10 Jan 2010)
New Revision: 12593

Modified:
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t
Log:
Properly merge the extra env var into the psgi environment.

Modified: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t	2010-01-10 04:42:14 UTC (rev 12592)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t	2010-01-10 04:42:21 UTC (rev 12593)
@@ -13,8 +13,7 @@
 
 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 tests => 7;
@@ -27,13 +26,16 @@
 {
     my $env;
 
-    ok( my $response = request("http://localhost/dump/env"),
-        'Request' );
+    my $response = request("http://localhost/dump/env", {
+        extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL },
+    });
+
+    ok( $response, 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
     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';
 
     SKIP:
     {