now really die

diff --git a/MANIFEST b/MANIFEST
index 32cb2be..59015e7 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -55,7 +55,6 @@ t/lib/Catalyst/Plugin/Test/Errors.pm
 t/lib/Catalyst/Plugin/Test/Headers.pm
 t/lib/TestApp.pm
 t/lib/TestApp/Controller/Action.pm
-t/lib/TestApp/Controller/Action/Absolute.pm
 t/lib/TestApp/Controller/Action/Begin.pm
 t/lib/TestApp/Controller/Action/Default.pm
 t/lib/TestApp/Controller/Action/End.pm
@@ -64,7 +63,6 @@ t/lib/TestApp/Controller/Action/Inheritance.pm
 t/lib/TestApp/Controller/Action/Path.pm
 t/lib/TestApp/Controller/Action/Private.pm
 t/lib/TestApp/Controller/Action/Regexp.pm
-t/lib/TestApp/Controller/Action/Relative.pm
 t/lib/TestApp/Controller/Dump.pm
 t/lib/TestApp/Controller/Engine/Response/Cookies.pm
 t/lib/TestApp/Controller/Engine/Response/Errors.pm

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index eff1a43..10d5c3e 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -76,6 +76,8 @@ sub import {
 
     else {
         $class->require;
+        my $error = $UNIVERSAL::require::ERROR;
+        die qq/Couldn't load "$class", "$error"/ if $error;
 
         unless ( $INC{'Test/Builder.pm'} ) {
             die qq/Couldn't load "$class", "$@"/ if $@;
@@ -108,7 +110,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 +125,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 +135,8 @@ sub remote_request {
 
     unless ($agent) {
         $agent = LWP::UserAgent->new(
-         #  cookie_jar   => {},
+
+            #  cookie_jar   => {},
             keep_alive   => 1,
             max_redirect => 0,
             timeout      => 60,