X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=addd031c771a9f19cfb99d56ff235e0fdfac7fd9;hb=3c9b6867515767b70b7771dd0c32a532f23e876b;hp=815166aee6f3e4661a5ad67381cf668a15bed1b7;hpb=4fbc0e853c0b29d1f6082909b0cb54595ea32787;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 815166a..addd031 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -38,19 +38,24 @@ my $build_exports = sub {
         Catalyst::Exception->throw("$me only works with local requests, not remote")
             if $ENV{CATALYST_SERVER};
 
+        ### check explicitly for the class here, or the Cat->meta call will blow
+        ### up in our face
+        Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") unless $class;
+
         ### place holder for $c after the request finishes; reset every time
         ### requests are done.
         my $c;
 
         ### hook into 'dispatch' -- the function gets called after all plugins
         ### have done their work, and it's an easy place to capture $c.
-        no warnings 'redefine';
-        my $dispatch = Catalyst->can('dispatch');
-        local *Catalyst::dispatch = sub {
-            $c = shift;
-            $dispatch->( $c, @_ );
-        };
 
+        my $meta = Catalyst->meta;
+        $meta->make_mutable;
+        $meta->add_after_method_modifier( "dispatch", sub {
+            $c = shift;
+        });
+        $meta->make_immutable;
+        
         ### do the request; C::T::request will know about the class name, and
         ### we've already stopped it from doing remote requests above.
         my $res = $request->( @_ );
@@ -129,20 +134,6 @@ Catalyst::Test - Test Catalyst Applications
     # Run tests against a remote server
     CATALYST_SERVER='http://localhost:3000/' prove -r -l lib/ t/
 
-    # Tests with inline apps need to use Catalyst::Engine::Test
-    package TestApp;
-
-    use Catalyst;
-
-    sub foo : Global {
-            my ( $self, $c ) = @_;
-            $c->res->output('bar');
-    }
-
-    __PACKAGE__->setup();
-
-    package main;
-
     use Catalyst::Test 'TestApp';
     use Test::More tests => 1;
 
@@ -165,10 +156,28 @@ L<HTTP::Request::AsCGI> or remotely if you define the CATALYST_SERVER
 environment variable. This module also adds a few catalyst
 specific testing methods as displayed in the method section.
 
-The </get> and </request> functions take either a URI or an L<HTTP::Request>
+The L<get> and L<request> functions take either a URI or an L<HTTP::Request>
 object.
 
-=head2 METHODS
+=head1 INLINE TESTS WILL NO LONGER WORK
+
+While it used to be possible to inline a whole testapp into a C<.t> file for a
+distribution, this will no longer work.
+
+The convention is to place your L<Catalyst> test apps into C<t/lib> in your
+distribution. E.g.: C<t/lib/TestApp.pm>, C<t/lib/TestApp/Controller/Root.pm>,
+etc..  Multiple test apps can be used in this way.
+
+Then write your C<.t> files like so:
+
+    use strict;
+    use warnings;
+    use FindBin '$Bin';
+    use lib "$Bin/lib";
+    use Test::More tests => 6;
+    use Catalyst::Test 'TestApp';
+
+=head1 METHODS
 
 =head2 $content = get( ... )
 
@@ -189,7 +198,7 @@ method and the L<request> method below:
 
 =head2 $res = request( ... );
 
-Returns a C<HTTP::Response> object. Accepts an optional hashref for request
+Returns a L<HTTP::Response> object. Accepts an optional hashref for request
 header configuration; currently only supports setting 'host' value.
 
     my $res = request('foo/bar?test=1');
@@ -199,8 +208,8 @@ header configuration; currently only supports setting 'host' value.
 
 =head2 ($res, $c) = ctx_request( ... );
 
-Works exactly like C<Catalyst::Test::request>, except it also returns the
-catalyst context object, C<$c>. Note that this only works for local requests.
+Works exactly like L<request>, except it also returns the Catalyst context object,
+C<$c>. Note that this only works for local requests.
 
 =head2 $res = Catalyst::Test::local_request( $AppClass, $url );
 
@@ -217,7 +226,7 @@ sub local_request {
     _customize_request($request, @_);
     my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
 
-    $class->handle_request;
+    $class->handle_request( env => \%ENV );
 
     return $cgi->restore->response;
 }
@@ -301,23 +310,23 @@ sub _customize_request {
 
 =head2 action_ok
 
-Fetches the given url and check that the request was successful
+Fetches the given URL and check that the request was successful
 
 =head2 action_redirect
 
-Fetches the given url and check that the request was a redirect
+Fetches the given URL and check that the request was a redirect
 
 =head2 action_notfound
 
-Fetches the given url and check that the request was not found
+Fetches the given URL and check that the request was not found
 
 =head2 content_like
 
-Fetches the given url and matches the content against it.
+Fetches the given URL and matches the content against it.
 
 =head2 contenttype_is 
     
-Check for given mime type
+Check for given MIME type
 
 =head1 SEE ALSO