X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=2f91020494c15f48f94a36db77f4178278f6a5e7;hb=e88fa0583c4c7f6b06e76e125f2fae681202ae0a;hp=10d5c3ea6335cd97100c0c28c1899b8c525a1883;hpb=9ffadf88044260afc4dfb058cbfc08a3b0a803f0;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 10d5c3e..2f91020 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -27,12 +27,12 @@ Catalyst::Test - Test Catalyst applications
 
     use Catalyst qw[-Engine=Test];
 
-    __PACKAGE__->action(
-        foo => sub {
+    sub foo : Global {
             my ( $self, $c ) = @_;
             $c->res->output('bar');
-        }
-    );
+    }
+
+    __PACKAGE__->setup();
 
     package main;
 
@@ -77,11 +77,7 @@ 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 $@;
-        }
+        die qq/Couldn't load "$class", "$error"/ if $@;
 
         $class->import;