Applied patch from Ton Voon, using Catalyst::Test without App name

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

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 35fe18d..ee37228 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use Catalyst::Exception;
 use Catalyst::Utils;
-use UNIVERSAL::require;
+use Class::Inspector;
 
 =head1 NAME
 
@@ -72,11 +72,13 @@ sub import {
     if ( $ENV{CATALYST_SERVER} ) {
         $request = sub { remote_request(@_) };
         $get     = sub { remote_request(@_)->content };
-    }
-
-    else {
-        $class->require;
-        die $@ if $@;
+    } elsif (! $class) {
+        $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") };
+        $get     = $request;
+    } else {
+        unless( Class::Inspector->loaded( $class ) ) {
+            require Class::Inspector->filename( $class );
+        }
         $class->import;
 
         $request = sub { local_request( $class, @_ ) };