use Catalyst::Exception;
use Catalyst::Utils;
-use UNIVERSAL::require;
-
-$ENV{CATALYST_ENGINE} ||= 'CGI';
+use Class::Inspector;
=head1 NAME
my $content = get('foo/bar?test=1');
+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<request> method below:
+
+ my $res = request('/'); # redirects to /y
+ warn $res->header('location');
+ use URI;
+ my $uri = URI->new($res->header('location'));
+ is ( $uri->path , '/y');
+ my $content = get($uri->path);
+
=head2 request
Returns a C<HTTP::Response> object.
if ( $ENV{CATALYST_SERVER} ) {
$request = sub { remote_request(@_) };
$get = sub { remote_request(@_)->content };
- }
-
- else {
- $class->require;
- die if $@ && $@ !~ /^Can't locate /;
+ } elsif (! $class) {
+ $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") };
+ $get = $request;
+ } else {
+ unless( Class::Inspector->loaded( $class ) ) {
+ require Class::Inspector->filename( $class );
+ }
$class->import;
$request = sub { local_request( $class, @_ ) };
my $server = URI->new( $ENV{CATALYST_SERVER} );
if ( $server->path =~ m|^(.+)?/$| ) {
- $server->path("$1"); # need to be quoted
+ 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 );