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

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 8776803..ae5e3ab 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -4,10 +4,12 @@ use strict;
 use warnings;
 use Test::More ();
 
+use Plack::Test;
 use Catalyst::Exception;
 use Catalyst::Utils;
 use Class::MOP;
 use Sub::Exporter;
+use Carp;
 
 my $build_exports = sub {
     my ($self, $meth, $args, $defaults) = @_;
@@ -15,17 +17,21 @@ my $build_exports = sub {
     my $request;
     my $class = $args->{class};
 
+    if (!$class) {
+        croak "Must specify a test app: use Catalyst::Test 'TestApp'";
+    }
+
     if ( $ENV{CATALYST_SERVER} ) {
         $request = sub { remote_request(@_) };
-    } elsif (! $class) {
-        $request = sub { Catalyst::Exception->throw("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->run;
+
+        $request = sub { local_request( $app, @_ ) };
     }
 
     my $get = sub { $request->(@_)->content };
@@ -218,19 +224,15 @@ Simulate a request using L<HTTP::Request::AsCGI>.
 =cut
 
 sub local_request {
-    my $class = shift;
+    my $app = shift;
 
-    require HTTP::Request::AsCGI;
-
-    my $request = Catalyst::Utils::request( shift(@_) );
+    my $request = Catalyst::Utils::request(shift);
     _customize_request($request, @_);
-    my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
 
-    $class->handle_request( env => \%ENV );
+    my $ret;
+    test_psgi app => $app, client => sub { $ret = shift->($request) };
 
-    my $response = $cgi->restore->response;
-    $response->request( $request );
-    return $response;
+    return $ret;
 }
 
 my $agent;