removed UNIVERSAL::require from core

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

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index e227bad..b46742d 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -5,9 +5,7 @@ use warnings;
 
 use Catalyst::Exception;
 use Catalyst::Utils;
-use UNIVERSAL::require;
-
-$ENV{CATALYST_ENGINE} ||= 'CGI';
+use Class::Inspector;
 
 =head1 NAME
 
@@ -77,8 +75,9 @@ sub import {
     }
 
     else {
-        $class->require;
-        die if $@ && $@ !~ /^Can't locate /;
+        unless( Class::Inspector->loaded( $class ) ) {
+            require Class::Inspector->filename( $class );
+        }
         $class->import;
 
         $request = sub { local_request( $class, @_ ) };