X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=4ca73ee7a04877c8081831f978984df8dc082d1c;hb=d96e14c21fb544597f459aaaad969c34af7f2d1f;hp=b0776e49483945ee6830977661c3d40c05ecd7ab;hpb=45374ac6977e9464410a8c7518fb26ab812258cb;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index b0776e4..4ca73ee 100644
--- 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 };
     }
@@ -94,11 +96,12 @@ sub remote_request {
 
     require LWP::UserAgent;
 
-    my $remote = URI->new( $ENV{CATALYST_REMOTE} );
+    my $remote = URI->new( $ENV{CATALYST_SERVER} );
 
     unless ( ref $request ) {
 
-        my $uri = ( $request =~ m/http/i )
+        my $uri =
+          ( $request =~ m/http/i )
           ? URI->new($request)
           : URI->new( 'http://localhost' . $request );