X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=ebf14ec80efb26115c871b0bfbfdc551994a261a;hb=a1102dfa7163c7e8414cbcd3258e13b383350096;hp=fc29985afc6b24a28b47be5b8694ce2d7c4297fc;hpb=75fd617a0395f9a49cd215c17bb21f4fadf14db4;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index fc29985..ebf14ec 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -1,9 +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
 
@@ -20,19 +24,19 @@ Catalyst::Test - Test Catalyst applications
     get('index.html');
 
     # Run tests against a remote server
-    CATALYST_SERVER='http://localhost:3000/' prove -l lib/ t/
+    CATALYST_SERVER='http://localhost:3000/' prove -r -l lib/ t/
 
     # Tests with inline apps need to use Catalyst::Engine::Test
     package TestApp;
 
     use Catalyst qw[-Engine=Test];
 
-    __PACKAGE__->action(
-        foo => sub {
+    sub foo : Global {
             my ( $self, $c ) = @_;
             $c->res->output('bar');
-        }
-    );
+    }
+
+    __PACKAGE__->setup();
 
     package main;
 
@@ -47,17 +51,19 @@ Test Catalyst applications.
 
 =head2 METHODS
 
-=head3 get
+=over 4
+
+=item get
 
 Returns the content.
 
     my $content = get('foo/bar?test=1');
 
-=head3 request
+=item request
 
 Returns a C<HTTP::Response> object.
 
-    my $res =request('foo/bar?test=1');
+    my $res = request('foo/bar?test=1');
 
 =cut
 
@@ -74,15 +80,11 @@ sub import {
 
     else {
         $class->require;
-
-        unless ( $INC{'Test/Builder.pm'} ) {
-            die qq/Couldn't load "$class", "$@"/ if $@;
-        }
-
+        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';
@@ -91,36 +93,63 @@ 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
+
+Do an actual remote request using LWP.
+
+=cut
+
 sub remote_request {
-    my $request = shift;
 
     require LWP::UserAgent;
 
-    my $server = URI->new( $ENV{CATALYST_SERVER} );
+    my $request = Catalyst::Utils::request( shift(@_) );
+    my $server  = URI->new( $ENV{CATALYST_SERVER} );
 
-    unless ( ref $request ) {
+    if ( $server->path =~ m|^(.+)?/$| ) {
+        $server->path("$1");    # need to be quoted
+    }
 
-        my $uri =
-          ( $request =~ m/http/i )
-          ? URI->new($request)
-          : URI->new( 'http://localhost' . $request );
+    $request->uri->scheme( $server->scheme );
+    $request->uri->host( $server->host );
+    $request->uri->port( $server->port );
+    $request->uri->path( $server->path . $request->uri->path );
 
-        $request = $uri->canonical;
-    }
+    unless ($agent) {
 
-    $request->scheme( $server->scheme );
-    $request->host( $server->host );
-    $request->port( $server->port );
+        $agent = LWP::UserAgent->new(
+            keep_alive   => 1,
+            max_redirect => 0,
+            timeout      => 60,
+        );
 
-    unless ( ref $request eq 'HTTP::Request' ) {
-        $request = HTTP::Request->new( 'GET', $request );
+        $agent->env_proxy;
     }
 
-    my $agent = LWP::UserAgent->new;
-
     return $agent->request($request);
 }
 
+=back 
+
 =head1 SEE ALSO
 
 L<Catalyst>.