X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=a9f74e5512112b4f78a1d6d2bde805a6f20c1f93;hb=df8632c6f6e84979072f5592fff7546b3bed68d0;hp=10c52a5e5f969e992c9f8a2d5b62aa0a363a3701;hpb=aa777f5683889f7a5fe8b3352cde20dde8f35a3d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 10c52a5..a9f74e5 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -1,6 +1,8 @@
 package Catalyst::Test;
 
 use strict;
+
+use Catalyst::Utils;
 use UNIVERSAL::require;
 
 $ENV{CATALYST_ENGINE} = 'Test';
@@ -27,12 +29,12 @@ Catalyst::Test - Test Catalyst applications
 
     use Catalyst qw[-Engine=Test];
 
-    __PACKAGE__->action(
-        foo => sub {
+    sub foo : Global {
             my ( $self, $c ) = @_;
             $c->res->output('bar');
-        }
-    );
+    }
+
+    __PACKAGE__->setup();
 
     package main;
 
@@ -100,25 +102,12 @@ Do an actual remote rquest using LWP.
 =cut
 
 sub remote_request {
-    my $request = shift;
-
-    require LWP::UserAgent;
-
-    unless ( ref $request ) {
-
-        my $uri =
-          ( $request =~ m/http/i )
-          ? URI->new($request)
-          : URI->new( 'http://localhost' . $request );
 
-        $request = $uri->canonical;
-    }
-
-    unless ( ref $request eq 'HTTP::Request' ) {
-        $request = HTTP::Request->new( 'GET', $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
@@ -129,14 +118,14 @@ sub remote_request {
     $request->uri->port( $server->port );
     $request->uri->path( $server->path . $request->uri->path );
 
-    unless ($agent) {
-        $agent = LWP::UserAgent->new(
+    unless ( $agent ) {
 
-            #  cookie_jar   => {},
+        $agent = LWP::UserAgent->new(
             keep_alive   => 1,
             max_redirect => 0,
             timeout      => 60,
         );
+
         $agent->env_proxy;
     }