From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 10 Jan 2010 17:03:32 +0000 (+0000)
Subject: Inline the OverrideEnv middleware into Catalyst::Test.
X-Git-Tag: 5.89000~55
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d87ef823aab719b5e2cdd08f24e4db84c6cabf1b

Inline the OverrideEnv middleware into Catalyst::Test.
---

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 821b6e3..191c637 100644
--- 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;
@@ -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;
 }
diff --git a/lib/Plack/Middleware/OverrideEnv.pm b/lib/Plack/Middleware/OverrideEnv.pm
deleted file mode 100644
index f145023..0000000
--- a/lib/Plack/Middleware/OverrideEnv.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package Plack::Middleware::OverrideEnv;
-
-use strict;
-use warnings;
-use parent 'Plack::Middleware';
-
-use Plack::Util::Accessor qw(env_override);
-
-sub call {
-    my ($self, $env) = @_;
-    return $self->app->({ %{ $env }, %{ $self->env_override || {} } });
-}
-
-1;