clean up logging and debug output, minor doc fixes

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

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