diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm index 085ceb837..966be7a4c 100644 --- a/t/lib/WebGUI/Test.pm +++ b/t/lib/WebGUI/Test.pm @@ -139,6 +139,8 @@ If true, the session won't be registered for automatic deletion. =cut sub newSession { + shift + if eval { $_[0]->isa($CLASS) }; my $noCleanup = shift; require WebGUI::Session; my $session = WebGUI::Session->open( $CLASS->config, newEnv() ); @@ -149,7 +151,10 @@ sub newSession { } sub newEnv { + shift + if eval { $_[0]->isa($CLASS) }; my $form = shift; + require HTTP::Message::PSGI; require HTTP::Request::Common; my $config = $CLASS->config; @@ -1027,7 +1032,7 @@ This is a class method. my @guarded; sub addToCleanup { shift - if try { $_[0]->isa($CLASS) }; + if eval { $_[0]->isa($CLASS) }; push @guarded, cleanupGuard(@_); }