X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=b46742da20a3bb3310285157ed2a729edc8f19b8;hb=e5c7adea1c2115b30ff57b2f6e6035020c5216d3;hp=e227bad45f492035b077226fdf34758363129777;hpb=b5ecfcf07b8ffe7e9984f0279c8781ce51c6ac6a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index e227bad..b46742d 100644 --- 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, @_ ) };