[Catalyst-commits] r13927 - Catalyst-Plugin-Authentication/0.10000/trunk/t/lib

[hobbs at dev.catalyst.perl.org]

Author: hobbs
Date: 2011-01-24 23:28:27 +0000 (Mon, 24 Jan 2011)
New Revision: 13927

Modified:
   Catalyst-Plugin-Authentication/0.10000/trunk/t/lib/RemoteTestEngine.pm
Log:
Patch the live-app tests to work with PSGI-branch Catalyst.


Modified: Catalyst-Plugin-Authentication/0.10000/trunk/t/lib/RemoteTestEngine.pm
===================================================================
--- Catalyst-Plugin-Authentication/0.10000/trunk/t/lib/RemoteTestEngine.pm	2011-01-24 23:28:10 UTC (rev 13926)
+++ Catalyst-Plugin-Authentication/0.10000/trunk/t/lib/RemoteTestEngine.pm	2011-01-24 23:28:27 UTC (rev 13927)
@@ -1,12 +1,27 @@
 package RemoteTestEngine;
-use base 'Catalyst::Engine::CGI';
+BEGIN {
+  require Catalyst;
+  if ($Catalyst::VERSION >= 5.89000) {
+    require Catalyst::Engine;
+    @ISA = qw(Catalyst::Engine);
+  } else {
+    require Catalyst::Engine::CGI;
+    @ISA = qw(Catalyst::Engine::CGI);
+  }
+}
 
 our $REMOTE_USER;
 our $SSL_CLIENT_S_DN;
 
 sub env {
     my $self = shift;
-    my %e = %ENV;
+    my %e;
+    if ($Catalyst::VERSION >= 5.89000) {
+      %e = %{ $self->SUPER::env() };
+    } else {
+      %e = %ENV;
+    }
+
     $e{REMOTE_USER} = $REMOTE_USER;
     $e{SSL_CLIENT_S_DN} = $SSL_CLIENT_S_DN;
     return \%e;