Merge trunk into here, fix tests to pass again with the newer versions of Plack

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Test.pm

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index e940be0..1a15f9f 100644 (file)
--- 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) = @_;
@@ -17,15 +19,17 @@ my $build_exports = sub {
 
     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->psgi_app;
+
+        $request = sub { local_request( $app, @_ ) };
     }
 
     my $get = sub { $request->(@_)->content };
@@ -227,19 +231,18 @@ Simulate a request using L<HTTP::Request::AsCGI>.
 =cut
 
 sub local_request {
-    my $class = shift;
-
-    require HTTP::Request::AsCGI;
+    my $app = shift;
 
-    my $request = Catalyst::Utils::request( shift(@_) );
-    _customize_request($request, @_);
-    my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
+    my $request = Catalyst::Utils::request(shift);
+    my %extra_env;
+    _customize_request($request, \%extra_env, @_);
 
-    $class->handle_request( env => \%ENV );
+    my $ret;
+    test_psgi
+        app    => sub { $app->({ %{ $_[0] }, %extra_env }) },
+        client => sub { $ret = shift->($request) };
 
-    my $response = $cgi->restore->response;
-    $response->request( $request );
-    return $response;
+    return $ret;
 }
 
 my $agent;
@@ -312,11 +315,16 @@ sub remote_request {
 
 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