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=53c16a203e9265e4ff65d427d799f2afe026c6df;hp=e04bdbff5649db5f93af18043849db20fcfb8f06;hb=d0cacee71a316290bc01f0e12681c16bdc1e84e2;hpb=7e58c6275aeae6b53fb5be463fe1defbd31b7295 diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm index e04bdbf..53c16a2 100644 --- a/lib/Catalyst/Test.pm +++ b/lib/Catalyst/Test.pm @@ -209,8 +209,8 @@ functions take either a URI or an L object. =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. +While it used to be possible to inline a whole test app 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, @@ -262,93 +262,77 @@ C<$c>. Note that this only works for local requests. =cut -sub _local_request { - my $class = shift; - - my $app = ref($class) eq "CODE" ? $class : $class->_finalized_psgi_app; +sub _request { + my $args = shift; my $request = Catalyst::Utils::request(shift); + my %extra_env; _customize_request($request, \%extra_env, @_); + $args->{mangle_request}->($request) if $args->{mangle_request}; my $ret; test_psgi - app => sub { $app->({ %{ $_[0] }, %extra_env }) }, + %{ $args }, + app => sub { $args->{app}->({ %{ $_[0] }, %extra_env }) }, client => sub { - my $psgi_app = shift; - + my ($psgi_app) = @_; my $resp = $psgi_app->($request); + $args->{mangle_response}->($resp) if $args->{mangle_response}; + $ret = $resp; + }; + + return $ret; +} + +sub _local_request { + my $class = shift; + + return _request({ + app => ref($class) eq "CODE" ? $class : $class->_finalized_psgi_app, + mangle_response => sub { + my ($resp) = @_; # HTML head parsing based on LWP::UserAgent # + # This is because if you make a remote request with LWP, then the + # from the returned HTML document will be used + # to fill in $res->base, as documented in HTTP::Response. We need + # to support this in local test requests so that they work 'the same'. + # # This is not just horrible and possibly broken, but also really # doesn't belong here. Whoever wants this should be working on # getting it into Plack::Test, or make a middleware out of it, or # whatever. Seriously - horrible. - require HTML::HeadParser; + if (!$resp->content_type || $resp->content_is_html) { + require HTML::HeadParser; - my $parser = HTML::HeadParser->new(); - $parser->xml_mode(1) if $resp->content_is_xhtml; - $parser->utf8_mode(1) if $] >= 5.008 && $HTML::Parser::VERSION >= 3.40; + my $parser = HTML::HeadParser->new(); + $parser->xml_mode(1) if $resp->content_is_xhtml; + $parser->utf8_mode(1) if $] >= 5.008 && $HTML::Parser::VERSION >= 3.40; - $parser->parse( $resp->content ); - my $h = $parser->header; - for my $f ( $h->header_field_names ) { - $resp->init_header( $f, [ $h->header($f) ] ); + $parser->parse( $resp->content ); + my $h = $parser->header; + for my $f ( $h->header_field_names ) { + $resp->init_header( $f, [ $h->header($f) ] ); + } } - - $ret = $resp; - }; - - return $ret; + # Another horrible hack to make the response headers have a + # 'status' field. This is for back-compat, but you should + # call $resp->code instead! + $resp->init_header('status', [ $resp->code ]); + }, + }, @_); } my $agent; sub _remote_request { require LWP::UserAgent; - - my $request = Catalyst::Utils::request( shift(@_) ); - my $server = URI->new( $ENV{CATALYST_SERVER} ); - - _customize_request($request, @_); - - if ( $server->path =~ m|^(.+)?/$| ) { - my $path = $1; - $server->path("$path") if $path; # need to be quoted - } - - # the request path needs to be sanitised if $server is using a - # non-root path due to potential overlap between request path and - # response path. - if ($server->path) { - # If request path is '/', we have to add a trailing slash to the - # final request URI - my $add_trailing = ($request->uri->path eq '/' || $request->uri->path eq '') ? 1 : 0; - - my @sp = split '/', $server->path; - my @rp = split '/', $request->uri->path; - shift @sp;shift @rp; # leading / - if (@rp) { - foreach my $sp (@sp) { - $sp eq $rp[0] ? shift @rp : last - } - } - $request->uri->path(join '/', @rp); - - if ( $add_trailing ) { - $request->uri->path( $request->uri->path . '/' ); - } - } - - $request->uri->scheme( $server->scheme ); - $request->uri->host( $server->host ); - $request->uri->port( $server->port ); - $request->uri->path( $server->path . $request->uri->path ); + local $Plack::Test::Impl = 'ExternalServer'; unless ($agent) { - $agent = LWP::UserAgent->new( keep_alive => 1, max_redirect => 0, @@ -362,7 +346,43 @@ sub _remote_request { $agent->env_proxy; } - return $agent->request($request); + + my $server = URI->new($ENV{CATALYST_SERVER}); + if ( $server->path =~ m|^(.+)?/$| ) { + my $path = $1; + $server->path("$path") if $path; # need to be quoted + } + + return _request({ + ua => $agent, + uri => $server, + mangle_request => sub { + my ($request) = @_; + + # the request path needs to be sanitised if $server is using a + # non-root path due to potential overlap between request path and + # response path. + if ($server->path) { + # If request path is '/', we have to add a trailing slash to the + # final request URI + my $add_trailing = ($request->uri->path eq '/' || $request->uri->path eq '') ? 1 : 0; + + my @sp = split '/', $server->path; + my @rp = split '/', $request->uri->path; + shift @sp; shift @rp; # leading / + if (@rp) { + foreach my $sp (@sp) { + $sp eq $rp[0] ? shift @rp : last + } + } + $request->uri->path(join '/', @rp); + + if ( $add_trailing ) { + $request->uri->path( $request->uri->path . '/' ); + } + } + }, + }, @_); } for my $name (qw(local_request remote_request)) {