[Catalyst-commits] r12597 - in Catalyst-Runtime/5.80/branches/psgi/lib: . Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-10 17:03:32 +0000 (Sun, 10 Jan 2010)
New Revision: 12597

Removed:
   Catalyst-Runtime/5.80/branches/psgi/lib/Plack/
Modified:
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm
Log:
Inline the OverrideEnv middleware into Catalyst::Test.

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm	2010-01-10 14:22:15 UTC (rev 12596)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Test.pm	2010-01-10 17:03:32 UTC (rev 12597)
@@ -5,7 +5,6 @@
 use Test::More ();
 
 use Plack::Test;
-use Plack::Middleware::OverrideEnv;
 use Catalyst::Exception;
 use Catalyst::Utils;
 use Class::MOP;
@@ -231,12 +230,8 @@
 
     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;
 }