Merge branch 'WebGUI8' into psgi

lib/WebGUI/Asset/Wobject/StoryArchive.pm

@@ -196,7 +196,7 @@ sub exportAssetCollateral {
     }
 
     # open another session to handle printing...
-    my $printSession = WebGUI::Session->duplicate;
+    my $printSession = $self->session->duplicate;
 
     my $keywordObj = WebGUI::Keyword->new($printSession);
     my $keywords = $keywordObj->findKeywords({

lib/WebGUI/Role/Asset/RssFeed.pm

@@ -165,9 +165,10 @@ The session doing the full export.  Can be used to report status messages.
 
 =cut
 
-sub exportAssetCollateral {
+around exportAssetCollateral => sub {
     # Lots of copy/paste here from AssetExportHtml.pm, since none of the methods there were
     #   directly useful without ginormous refactoring.
+    my $orig = shift;
     my $self = shift;
     my $basepath = shift;
     my $args = shift;
@@ -209,7 +210,7 @@ sub exportAssetCollateral {
             $reportSession->output->print(
                 '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $message . '<br />');
         }
-        my $exportSession = WebGUI::Session->duplicate;
+        my $exportSession = $self->session->duplicate;
 
         # open another session as the user doing the exporting...
         my $selfdupe = WebGUI::Asset->newById( $exportSession, $self->getId );
@@ -242,8 +243,8 @@ sub exportAssetCollateral {
             $reportSession->output->print($reporti18n->get('done'));
         }
     }
-    return $self->next::method($basepath, $args, $reportSession);
-}
+    return $self->$orig($basepath, $args, $reportSession);
+};
 
 #-------------------------------------------------------------------
 

lib/WebGUI/Types.pm

@@ -17,6 +17,7 @@ package WebGUI::Types;
 
 use Moose;
 use Moose::Util::TypeConstraints;
+use JSON ();
 
 =head1 NAME
 

sbin/testEnvironment.pl

@@ -151,6 +151,7 @@ checkModule("Test::Harness",                "3.17"       );
 checkModule("DateTime::Event::ICal",        "0.10"       );
 checkModule( "CHI",                                      );
 checkModule( "Cache::FastMmap",                          );
+checkModule('IO::Socket::SSL',                           );
 
 failAndExit("Required modules are missing, running no more checks.") if $missingModule;
 

t/lib/WebGUI/Test.pm

@@ -1012,6 +1012,12 @@ sub addToCleanup {
 }
 
 sub cleanup {
+    if ($ENV{WEBGUI_TEST_NOCLEANUP}) {
+        (pop @guarded)->dismiss
+            while @guarded;
+        return;
+    }
+
     # remove guards in reverse order they were added, triggering all of the
     # requested cleanup operations
     pop @guarded