X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=7868e03f7a7b4ed08a2fc0ce47003ac2c6984b4e;hb=22a5833d436649391dc95877ca33f549308c6c3c;hp=c8d32e87ddb0c27576934b7eb1cf6ec02b1b6137;hpb=f4b9686b68956c43b4809f91a75c744a9316c3ba;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index c8d32e8..7868e03 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -27,7 +27,7 @@ my $build_exports = sub {
         }
         $class->import;
 
-        my $app = $class->run;
+        my $app = $class->psgi_app;
 
         $request = sub { local_request( $app, @_ ) };
     }
@@ -225,10 +225,13 @@ sub local_request {
     my $app = shift;
 
     my $request = Catalyst::Utils::request(shift);
-    _customize_request($request, @_);
+    my %extra_env;
+    _customize_request($request, \%extra_env, @_);
 
     my $ret;
-    test_psgi app => $app, client => sub { $ret = shift->($request) };
+    test_psgi
+        app    => sub { $app->({ %{ $_[0] }, %extra_env }) },
+        client => sub { $ret = shift->($request) };
 
     return $ret;
 }
@@ -303,11 +306,16 @@ sub remote_request {
 
 sub _customize_request {
     my $request = shift;
+    my $extra_env = shift;
     my $opts = pop(@_) || {};
     $opts = {} unless ref($opts) eq 'HASH';
     if ( my $host = exists $opts->{host} ? $opts->{host} : $default_host  ) {
         $request->header( 'Host' => $host );
     }
+
+    if (my $extra = $opts->{extra_env}) {
+        @{ $extra_env }{keys %{ $extra }} = values %{ $extra };
+    }
 }
 
 =head2 action_ok