X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=2f91020494c15f48f94a36db77f4178278f6a5e7;hb=8fbcd90cdb30aed53d22d1cdbad95880f1c11693;hp=eff1a43c86b6d3b7d6f351f9f2910f6e57ca0b7f;hpb=bea4160a7769e77996d8a820fc2602bd3f0f9029;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index eff1a43..2f91020 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -27,12 +27,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;
 
@@ -76,10 +76,8 @@ sub import {
 
     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;
 
@@ -108,7 +106,8 @@ sub remote_request {
 
     unless ( ref $request ) {
 
-        my $uri = ( $request =~ m/http/i )
+        my $uri =
+          ( $request =~ m/http/i )
           ? URI->new($request)
           : URI->new( 'http://localhost' . $request );
 
@@ -122,7 +121,7 @@ sub remote_request {
     my $server = URI->new( $ENV{CATALYST_SERVER} );
 
     if ( $server->path =~ m|^(.+)?/$| ) {
-        $server->path("$1"); # need to be quoted
+        $server->path("$1");    # need to be quoted
     }
 
     $request->uri->scheme( $server->scheme );
@@ -132,7 +131,8 @@ sub remote_request {
 
     unless ($agent) {
         $agent = LWP::UserAgent->new(
-         #  cookie_jar   => {},
+
+            #  cookie_jar   => {},
             keep_alive   => 1,
             max_redirect => 0,
             timeout      => 60,