Make build_psgi_app public and add MyApp->psgi_app.

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

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 821b6e3..7868e03 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -5,7 +5,6 @@ use warnings;
 use Test::More ();
 
 use Plack::Test;
-use Plack::Middleware::OverrideEnv;
 use Catalyst::Exception;
 use Catalyst::Utils;
 use Class::MOP;
@@ -28,7 +27,7 @@ my $build_exports = sub {
         }
         $class->import;
 
-        my $app = $class->engine->_build_psgi_app($class);
+        my $app = $class->psgi_app;
 
         $request = sub { local_request( $app, @_ ) };
     }
@@ -231,12 +230,8 @@ sub local_request {
 
     my $ret;
     test_psgi
-        app => Plack::Middleware::OverrideEnv->wrap(
-            $app, env_override => \%extra_env,
-        ),
-        client => sub {
-            $ret = shift->($request);
-        };
+        app    => sub { $app->({ %{ $_[0] }, %extra_env }) },
+        client => sub { $ret = shift->($request) };
 
     return $ret;
 }