merged conflicts

[catagits/Catalyst-Runtime.git] / t / aggregate / live_engine_request_remote_user.t

diff --git a/t/aggregate/live_engine_request_remote_user.t b/t/aggregate/live_engine_request_remote_user.t
index 7e5cba2..e6c8747 100644 (file)
--- a/t/aggregate/live_engine_request_remote_user.t
+++ b/t/aggregate/live_engine_request_remote_user.t
@@ -1,5 +1,3 @@
-#!perl
-
 # This tests to make sure the REMOTE_USER environment variable is properly passed through by the engine.
 
 use strict;
@@ -17,12 +15,11 @@ use HTTP::Request::Common;
 {
     my $creq;
 
-    local $ENV{REMOTE_USER} = 'dwc';
     my $request = GET(
         'http://localhost/dump/request',
     );
 
-    ok( my $response = request($request), 'Request' );
+    ok( my $response = request($request, { extra_env => { REMOTE_USER => 'dwc' } }), 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
     like( $response->content, qr/'Catalyst::Request'/,
@@ -33,7 +30,8 @@ use HTTP::Request::Common;
         ok(
             eval '$creq = ' . $response->content,
             'Unserialize Catalyst::Request'
-        );
+        )
+        or fail("Failed to deserialize $@ from " . $response->content);
     }
 
     isa_ok( $creq, 'Catalyst::Request' );