minor bugfixes

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Test.pm

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index b0776e4..5fe2a0c 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -20,7 +20,7 @@ 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;
@@ -41,7 +41,6 @@ Catalyst::Test - Test Catalyst applications
 
     ok( get('/foo') =~ /bar/ );
 
-
 =head1 DESCRIPTION
 
 Test Catalyst applications.
@@ -63,22 +62,25 @@ Returns a C<HTTP::Response> object.
 =cut
 
 sub import {
-    my $self = shift;
+    my $self  = shift;
     my $class = shift;
 
     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 $@;
         }
 
+        $class->import;
+
         $request = sub { $class->run(@_) };
         $get     = sub { $class->run(@_)->content };
     }
@@ -89,13 +91,13 @@ sub import {
     *{"$caller\::get"}     = $get;
 }
 
+my $agent;
+
 sub remote_request {
     my $request = shift;
 
     require LWP::UserAgent;
 
-    my $remote = URI->new( $ENV{CATALYST_REMOTE} );
-
     unless ( ref $request ) {
 
         my $uri = ( $request =~ m/http/i )
@@ -105,15 +107,30 @@ 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);
 }