},
action_ok => sub {
my $action = shift;
- return Test::More->builder->ok($request->($action)->is_success, @_);
+ my $meth = $request->($action)->request->method;
+ my @args = @_ ? @_ : ("$meth $action returns successfully");
+ return Test::More->builder->ok($request->($action)->is_success,@args);
},
action_redirect => sub {
my $action = shift;
- return Test::More->builder->ok($request->($action)->is_redirect,@_);
+ my $meth = $request->($action)->request->method;
+ my @args = @_ ? @_ : ("$meth $action returns a redirect");
+ return Test::More->builder->ok($request->($action)->is_redirect,@args);
},
action_notfound => sub {
my $action = shift;
- return Test::More->builder->is_eq($request->($action)->code,404,@_);
+ my $meth = $request->($action)->request->method;
+ my @args = @_ ? @_ : ("$meth $action returns a 404");
+ return Test::More->builder->is_eq($request->($action)->code,404,@args);
},
contenttype_is => sub {
my $action = shift;
=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
#
for my $f ( $h->header_field_names ) {
$resp->init_header( $f, [ $h->header($f) ] );
}
-
- $ret = $resp;
- };
-
- return $ret;
+ },
+ }, @_);
}
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 '/';
-
- 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,
$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)) {
}
}
-=head2 action_ok
+=head2 action_ok($url [, $test_name ])
-Fetches the given URL and checks that the request was successful.
+Fetches the given URL and checks that the request was successful. An optional
+second argument can be given to specify the name of the test.
-=head2 action_redirect
+=head2 action_redirect($url [, $test_name ])
-Fetches the given URL and checks that the request was a redirect.
+Fetches the given URL and checks that the request was a redirect. An optional
+second argument can be given to specify the name of the test.
-=head2 action_notfound
+=head2 action_notfound($url [, $test_name ])
-Fetches the given URL and checks that the request was not found.
+Fetches the given URL and checks that the request was not found. An optional
+second argument can be given to specify the name of the test.
-=head2 content_like( $url, $regexp [, $test_name] )
+=head2 content_like( $url, $regexp [, $test_name ] )
-Fetches the given URL and returns whether the content matches the regexp.
+Fetches the given URL and returns whether the content matches the regexp. An
+optional third argument can be given to specify the name of the test.
-=head2 contenttype_is
+=head2 contenttype_is($url, $type [, $test_name ])
-Check for given MIME type.
+Verify the given URL has a content type of $type and optionally specify a test name.
=head1 SEE ALSO