PseudoRequest shouldn't clobber Apache2::Cookies if the package already exists; mock requests are sometimes useful under mod_perl and this is a bit of a gotcha

scottwalters · scottwalters · commit 225df67d1fac · 2012-06-19T16:17:26.000-04:00
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.10.25
+ - fixed: don't clobber the request handler if WebGUI::Test was loaded inside of mod_perl
  - fixed #12365: editing a metadata may cause a fatal error (Arjan Widlak / United Knowledge)
  - fixed #12346: toVersion in upgrade_7.9.34-7.10.22.pl was "0.0.0"
  - fixed #12010 related link duplication where links have group view restrictions
diff --git a/t/lib/WebGUI/PseudoRequest.pm b/t/lib/WebGUI/PseudoRequest.pm
@@ -19,21 +19,25 @@ use strict;
 use Test::MockObject;
 
 BEGIN {
-    Test::MockObject->fake_module(
-        'Apache2::Cookie',
-        new => sub {
-            my $class = shift;
-            my $self = Test::MockObject->new;
-            $self->set_isa($class);
-            $self->set_true(qw(expires domain bake));
-        },
-    );
-
-    Test::MockObject->fake_module('APR::Request::Apache2',
-        handle => sub {
-            return $_[1];
-        },
-    );
+    if( do { no strict 'refs'; ! exists ${"Apache2::"}{"Cookie::"} } ) {
+        Test::MockObject->fake_module(
+            'Apache2::Cookie',
+            new => sub {
+                my $class = shift;
+                my $self = Test::MockObject->new;
+                $self->set_isa($class);
+                $self->set_true(qw(expires domain bake));
+            },
+        );
+    }
+
+    if( do { no strict 'refs'; ! exists ${"APR::"}{"Request::"} } ) {
+        Test::MockObject->fake_module('APR::Request::Apache2',
+            handle => sub {
+                return $_[1];
+            },
+        );
+    }
 }
 
 use WebGUI::PseudoRequest::Headers;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`7.10.25`
	`2`	`+ - fixed: don't clobber the request handler if WebGUI::Test was loaded inside of mod_perl`
`2`	`3`	`- fixed #12365: editing a metadata may cause a fatal error (Arjan Widlak / United Knowledge)`
`3`	`4`	`- fixed #12346: toVersion in upgrade_7.9.34-7.10.22.pl was "0.0.0"`
`4`	`5`	`- fixed #12010 related link duplication where links have group view restrictions`