X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=ae5e3ab30ceba6c916e2078ce9f6d085eeaabe4b;hb=ca3023fce6a4efe8f982a41990592313569b769d;hp=addd031c771a9f19cfb99d56ff235e0fdfac7fd9;hpb=e8674cf7f976c463a6a1bba11f327826973a5580;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index addd031..ae5e3ab 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -4,10 +4,12 @@ use strict; use warnings; use Test::More (); +use Plack::Test; use Catalyst::Exception; use Catalyst::Utils; use Class::MOP; use Sub::Exporter; +use Carp; my $build_exports = sub { my ($self, $meth, $args, $defaults) = @_; @@ -15,23 +17,27 @@ my $build_exports = sub { my $request; my $class = $args->{class}; + if (!$class) { + croak "Must specify a test app: use Catalyst::Test 'TestApp'"; + } + if ( $ENV{CATALYST_SERVER} ) { $request = sub { remote_request(@_) }; - } elsif (! $class) { - $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") }; } else { unless (Class::MOP::is_class_loaded($class)) { Class::MOP::load_class($class); } $class->import; - $request = sub { local_request( $class, @_ ) }; + my $app = $class->run; + + $request = sub { local_request( $app, @_ ) }; } my $get = sub { $request->(@_)->content }; my $ctx_request = sub { - my $me = ref $self || $self; + my $me = ref $self || $self; ### throw an exception if ctx_request is being used against a remote ### server @@ -49,13 +55,13 @@ my $build_exports = sub { ### hook into 'dispatch' -- the function gets called after all plugins ### have done their work, and it's an easy place to capture $c. - my $meta = Catalyst->meta; + my $meta = Class::MOP::get_metaclass_by_name($class); $meta->make_mutable; $meta->add_after_method_modifier( "dispatch", sub { $c = shift; }); - $meta->make_immutable; - + $meta->make_immutable( replace_constructor => 1 ); + Class::C3::reinitialize(); # Fixes RT#46459, I've failed to write a test for how/why, but it does. ### 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->( @_ ); @@ -153,11 +159,11 @@ 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 L and L functions take either a URI or an L -object. +The L and L +functions take either a URI or an L object. =head1 INLINE TESTS WILL NO LONGER WORK @@ -187,7 +193,7 @@ Returns the content. Note that this method doesn't follow redirects, so to test for a correctly redirecting page you'll need to use a combination of this -method and the L method below: +method and the L method below: my $res = request('/'); # redirects to /y warn $res->header('location'); @@ -198,7 +204,7 @@ method and the L method below: =head2 $res = request( ... ); -Returns a L 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'); @@ -208,7 +214,7 @@ header configuration; currently only supports setting 'host' value. =head2 ($res, $c) = ctx_request( ... ); -Works exactly like L, except it also returns the Catalyst context object, +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 ); @@ -218,17 +224,15 @@ Simulate a request using L. =cut sub local_request { - my $class = shift; + my $app = shift; - require HTTP::Request::AsCGI; - - my $request = Catalyst::Utils::request( shift(@_) ); + my $request = Catalyst::Utils::request(shift); _customize_request($request, @_); - my $cgi = HTTP::Request::AsCGI->new( $request, %ENV )->setup; - $class->handle_request( env => \%ENV ); + my $ret; + test_psgi app => $app, client => sub { $ret = shift->($request) }; - return $cgi->restore->response; + return $ret; } my $agent; @@ -260,7 +264,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 / @@ -270,7 +274,7 @@ sub remote_request { } } $request->uri->path(join '/', @rp); - + if ( $add_trailing ) { $request->uri->path( $request->uri->path . '/' ); } @@ -287,7 +291,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 => [], @@ -310,23 +314,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 @@ -339,7 +343,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