X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=2f91020494c15f48f94a36db77f4178278f6a5e7;hb=99d891a5a0d1e06d6d63aa61473c63752e71a4fd;hp=3de24ad53cb2d8b9449ba91adfab3552c029a1e1;hpb=66d9e175a28989d4454714edf2cc2dab5ad64d96;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 3de24ad..2f91020 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -20,19 +20,19 @@ Catalyst::Test - Test Catalyst applications
     get('index.html');
 
     # Run tests against a remote server
-    CATALYST_REMOTE='http://localhost:3000/' prove -l lib/ t/
+    CATALYST_SERVER='http://localhost:3000/' prove -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,13 +47,15 @@ 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.
 
@@ -67,16 +69,17 @@ sub import {
 
     my ( $get, $request );
 
-    if ( $ENV{CATALYST_REMOTE} ) {
+    if ( $ENV{CATALYST_SERVER} ) {
         $request = sub { remote_request(@_) };
         $get     = sub { remote_request(@_)->content };
     }
 
     else {
         $class->require;
-        unless ( $INC{'Test/Builder.pm'} ) {
-            die qq/Couldn't load "$class", "$@"/ if $@;
-        }
+        my $error = $UNIVERSAL::require::ERROR;
+        die qq/Couldn't load "$class", "$error"/ if $@;
+
+        $class->import;
 
         $request = sub { $class->run(@_) };
         $get     = sub { $class->run(@_)->content };
@@ -88,13 +91,19 @@ sub import {
     *{"$caller\::get"}     = $get;
 }
 
+my $agent;
+
+=item remote_request
+
+Do an actual remote rquest using LWP.
+
+=cut
+
 sub remote_request {
     my $request = shift;
 
     require LWP::UserAgent;
 
-    my $remote = URI->new( $ENV{CATALYST_REMOTE} );
-
     unless ( ref $request ) {
 
         my $uri =
@@ -105,19 +114,37 @@ sub remote_request {
         $request = $uri->canonical;
     }
 
-    $request->scheme( $remote->scheme );
-    $request->host( $remote->host );
-    $request->port( $remote->port );
-
     unless ( ref $request eq 'HTTP::Request' ) {
         $request = HTTP::Request->new( 'GET', $request );
     }
 
-    my $agent = LWP::UserAgent->new;
+    my $server = URI->new( $ENV{CATALYST_SERVER} );
+
+    if ( $server->path =~ m|^(.+)?/$| ) {
+        $server->path("$1");    # need to be quoted
+    }
+
+    $request->uri->scheme( $server->scheme );
+    $request->uri->host( $server->host );
+    $request->uri->port( $server->port );
+    $request->uri->path( $server->path . $request->uri->path );
+
+    unless ($agent) {
+        $agent = LWP::UserAgent->new(
+
+            #  cookie_jar   => {},
+            keep_alive   => 1,
+            max_redirect => 0,
+            timeout      => 60,
+        );
+        $agent->env_proxy;
+    }
 
     return $agent->request($request);
 }
 
+=back 
+
 =head1 SEE ALSO
 
 L<Catalyst>.