X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=658f233b706447b84a9ef3e08722cf30b59bc65e;hp=5e0ee163a61bf650d6ab57db1b4665781ab4f034;hb=536bee890cf24e0e4bcda7562e7b70cc03ca0620;hpb=269194b4f9de3905430a2d1f21f68da13b2b9ed9 diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index 5e0ee16..658f233 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -30,26 +30,31 @@ my $build_exports = sub { my $get = sub { $request->(@_)->content }; - my $crequest = sub { + my $ctx_request = sub { my $me = ref $self || $self; - ### throw an exception if crequest is being used against a remote + ### throw an exception if ctx_request is being used against a remote ### server 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 { + + my $meta = Catalyst->meta; + $meta->make_mutable; + $meta->add_after_method_modifier( "dispatch", sub { $c = shift; - $dispatch->( $c, @_ ); - }; + }); + $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. @@ -60,9 +65,9 @@ my $build_exports = sub { }; return { - request => $request, - get => $get, - crequest => $crequest, + request => $request, + get => $get, + ctx_request => $ctx_request, content_like => sub { my $action = shift; return Test::More->builder->like($get->($action),@_); @@ -118,7 +123,7 @@ Catalyst::Test - Test Catalyst Applications use Catalyst::Test 'TestApp'; my $content = get('index.html'); # Content as string my $response = request('index.html'); # HTTP::Response object - my($res, $c) = crequest('index.html'); # HTTP::Response & context object + my($res, $c) = ctx_request('index.html'); # HTTP::Response & context object use HTTP::Request::Common; my $response = request POST '/foo', [ @@ -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; @@ -162,13 +153,31 @@ Catalyst::Test - Test Catalyst Applications This module allows you to make requests to a Catalyst application either without a server, by simulating the environment of an HTTP request using L 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. +environment variable. This module also adds a few Catalyst-specific +testing methods as displayed in the method section. -The and functions take either a URI or an L +The L and L functions take either a URI or an L 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 test apps into C in your +distribution. E.g.: C, C, +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 method below: =head2 $res = request( ... ); -Returns a C object. Accepts an optional hashref for request +Returns an L object. Accepts an optional hashref for request header configuration; currently only supports setting 'host' value. my $res = request('foo/bar?test=1'); @@ -197,10 +206,10 @@ header configuration; currently only supports setting 'host' value. =head1 FUNCTIONS -=head2 ($res, $c) = crequest( ... ); +=head2 ($res, $c) = ctx_request( ... ); -Works exactly like C, except it also returns the -catalyst context object, C<$c>. Note that this only works for local requests. +Works exactly like L, 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; } @@ -251,7 +260,7 @@ sub remote_request { # If request path is '/', we have to add a trailing slash to the # final request URI my $add_trailing = $request->uri->path eq '/'; - + my @sp = split '/', $server->path; my @rp = split '/', $request->uri->path; shift @sp;shift @rp; # leading / @@ -261,7 +270,7 @@ sub remote_request { } } $request->uri->path(join '/', @rp); - + if ( $add_trailing ) { $request->uri->path( $request->uri->path . '/' ); } @@ -278,7 +287,7 @@ sub remote_request { keep_alive => 1, max_redirect => 0, timeout => 60, - + # work around newer LWP max_redirect 0 bug # http://rt.cpan.org/Ticket/Display.html?id=40260 requests_redirectable => [], @@ -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 checks 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 checks 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 checks that the request was not found. + +=head2 content_like( $url, $regexp [, $test_name] ) -=head2 content_like +Fetches the given URL and returns whether the content matches the regexp. -Fetches the given url and matches the content against it. +=head2 contenttype_is -=head2 contenttype_is - -Check for given mime type +Check for given MIME type. =head1 SEE ALSO @@ -330,7 +339,7 @@ Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT -This program is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut