X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=17ec18d09a6b417af54bcf3f49d619bc59cea029;hb=0f895006548490d5382421201b2f3f2f2406b7c6;hp=26cacf0f113e2a80b6145314a940f5061515bbed;hpb=a693340419bd7596e03694b66f1e5ab06dd9fee5;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 26cacf0..17ec18d 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -1,12 +1,13 @@
 package Catalyst::Test;
 
 use strict;
+use warnings;
 
 use Catalyst::Exception;
 use Catalyst::Utils;
 use UNIVERSAL::require;
 
-$ENV{CATALYST_ENGINE} = 'Test';
+$ENV{CATALYST_ENGINE} = 'CGI';
 
 =head1 NAME
 
@@ -62,7 +63,7 @@ Returns the content.
 
 Returns a C<HTTP::Response> object.
 
-    my $res =request('foo/bar?test=1');
+    my $res = request('foo/bar?test=1');
 
 =cut
 
@@ -79,11 +80,11 @@ sub import {
 
     else {
         $class->require;
-		die if $@ && $@ !~ /^Can't locate /;
+        die if $@ && $@ !~ /^Can't locate /;
         $class->import;
 
-        $request = sub { $class->run(@_) };
-        $get     = sub { $class->run(@_)->content };
+        $request = sub { local_request( $class, @_ ) };
+        $get     = sub { local_request( $class, @_ )->content };
     }
 
     no strict 'refs';
@@ -92,6 +93,23 @@ sub import {
     *{"$caller\::get"}     = $get;
 }
 
+=item local_request
+
+=cut
+
+sub local_request {
+    my $class = shift;
+
+    require HTTP::Request::AsCGI;
+
+    my $request = Catalyst::Utils::request( shift(@_) );
+    my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
+
+    $class->handle_request;
+
+    return $cgi->restore->response;
+}
+
 my $agent;
 
 =item remote_request
@@ -105,8 +123,7 @@ sub remote_request {
     require LWP::UserAgent;
 
     my $request = Catalyst::Utils::request( shift(@_) );
-
-    my $server = URI->new( $ENV{CATALYST_SERVER} );
+    my $server  = URI->new( $ENV{CATALYST_SERVER} );
 
     if ( $server->path =~ m|^(.+)?/$| ) {
         $server->path("$1");    # need to be quoted