use warnings;
use Test::More ();
+use Plack::Test;
+use Plack::Middleware::OverrideEnv;
use Catalyst::Exception;
use Catalyst::Utils;
use Class::MOP;
use Sub::Exporter;
+use Carp;
my $build_exports = sub {
my ($self, $meth, $args, $defaults) = @_;
if ( $ENV{CATALYST_SERVER} ) {
$request = sub { remote_request(@_) };
- } elsif (! $class) {
- $request = sub { Catalyst::Exception->throw("Must specify a test app: use Catalyst::Test 'TestApp'") };
+ } elsif (!$class) {
+ $request = sub { croak "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->engine->_build_psgi_app($class);
+
+ $request = sub { local_request( $app, @_ ) };
}
my $get = sub { $request->(@_)->content };
=cut
sub local_request {
- my $class = shift;
-
- require HTTP::Request::AsCGI;
-
- my $request = Catalyst::Utils::request( shift(@_) );
- _customize_request($request, @_);
- my $cgi = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
-
- $class->handle_request( env => \%ENV );
-
- return $cgi->restore->response;
+ my $app = shift;
+
+ my $request = Catalyst::Utils::request(shift);
+ my %extra_env;
+ _customize_request($request, \%extra_env, @_);
+
+ my $ret;
+ test_psgi
+ app => Plack::Middleware::OverrideEnv->wrap(
+ $app, env_override => \%extra_env,
+ ),
+ client => sub {
+ $ret = shift->($request);
+ };
+
+ return $ret;
}
my $agent;
sub _customize_request {
my $request = shift;
+ my $extra_env = shift;
my $opts = pop(@_) || {};
$opts = {} unless ref($opts) eq 'HASH';
if ( my $host = exists $opts->{host} ? $opts->{host} : $default_host ) {
$request->header( 'Host' => $host );
}
+
+ if (my $extra = $opts->{extra_env}) {
+ @{ $extra_env }{keys %{ $extra }} = values %{ $extra };
+ }
}
=head2 action_ok