diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 28a88d6a7..b5126e4fc 100644 --- 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 index 2526ff2c5..3def63d33 100644 --- 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)); - }, - ); + 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)); + }, + ); + } - Test::MockObject->fake_module('APR::Request::Apache2', - handle => sub { - return $_[1]; - }, - ); + if( do { no strict 'refs'; ! exists ${"APR::"}{"Request::"} } ) { + Test::MockObject->fake_module('APR::Request::Apache2', + handle => sub { + return $_[1]; + }, + ); + } } use WebGUI::PseudoRequest::Headers;