X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=821b6e314aeaa51e2b2f627bd3eb8450c5ad5cf8;hb=65791fc58356d0e6891ff3fdbc0dc6ed92698ee6;hp=8776803e7d70a8d0c518a49e170fc528a11c6ce9;hpb=12755afcb3cde2d52091b9e7c664b1a7a9bb2d62;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 8776803..821b6e3 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -4,10 +4,13 @@ use strict;
 use warnings;
 use Test::More ();
 
+use Plack::Test;
+use Plack::Middleware::OverrideEnv;
 use Catalyst::Exception;
 use Catalyst::Utils;
 use Class::MOP;
 use Sub::Exporter;
+use Carp;
 
 my $build_exports = sub {
     my ($self, $meth, $args, $defaults) = @_;
@@ -17,15 +20,17 @@ my $build_exports = sub {
 
     if ( $ENV{CATALYST_SERVER} ) {
         $request = sub { remote_request(@_) };
-    } elsif (! $class) {
-        $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") };
+    } elsif (!$class) {
+        $request = sub { croak "Must specify a test app: use Catalyst::Test 'TestApp'"; }
     } else {
         unless (Class::MOP::is_class_loaded($class)) {
             Class::MOP::load_class($class);
         }
         $class->import;
 
-        $request = sub { local_request( $class, @_ ) };
+        my $app = $class->engine->_build_psgi_app($class);
+
+        $request = sub { local_request( $app, @_ ) };
     }
 
     my $get = sub { $request->(@_)->content };
@@ -218,19 +223,22 @@ Simulate a request using L<HTTP::Request::AsCGI>.
 =cut
 
 sub local_request {
-    my $class = shift;
-
-    require HTTP::Request::AsCGI;
-
-    my $request = Catalyst::Utils::request( shift(@_) );
-    _customize_request($request, @_);
-    my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
-
-    $class->handle_request( env => \%ENV );
-
-    my $response = $cgi->restore->response;
-    $response->request( $request );
-    return $response;
+    my $app = shift;
+
+    my $request = Catalyst::Utils::request(shift);
+    my %extra_env;
+    _customize_request($request, \%extra_env, @_);
+
+    my $ret;
+    test_psgi
+        app => Plack::Middleware::OverrideEnv->wrap(
+            $app, env_override => \%extra_env,
+        ),
+        client => sub {
+            $ret = shift->($request);
+        };
+
+    return $ret;
 }
 
 my $agent;
@@ -303,11 +311,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