Merge branch 'master' into 8-merge

Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/Navigation.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/Config.pm
	lib/WebGUI/Form/Template.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Inbox.pm
	lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
	lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
	sbin/testEnvironment.pl
	t/AdSpace.t
	t/AdSpace/Ad.t
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/EMSSubmissionForm.t
	t/Asset/Event.t
	t/Asset/File/GalleryFile/Photo/00base.t
	t/Asset/File/GalleryFile/Photo/comment.t
	t/Asset/File/GalleryFile/Photo/download.t
	t/Asset/File/GalleryFile/Photo/edit.t
	t/Asset/File/GalleryFile/Photo/exif.t
	t/Asset/File/GalleryFile/Photo/makeResolutions.t
	t/Asset/File/GalleryFile/Photo/makeShortcut.t
	t/Asset/File/Image/setfile.t
	t/Asset/File/setfile.t
	t/Asset/Post.t
	t/Asset/Post/Thread/getAdjacentThread.t
	t/Asset/Sku.t
	t/Asset/Sku/ProductCollateral.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Template/HTMLTemplateExpr.t
	t/Asset/Wobject/Gallery/00base.t
	t/Asset/Wobject/GalleryAlbum/00base.t
	t/Asset/Wobject/GalleryAlbum/ajax.t
	t/Asset/Wobject/GalleryAlbum/delete.t
	t/Asset/Wobject/Matrix.t
	t/Asset/Wobject/StoryArchive.t
	t/Asset/Wobject/Survey/ExpressionEngine.t
	t/Asset/Wobject/Survey/Reports.t
	t/AssetAspect/RssFeed.t
	t/Auth/mech.t
	t/Config.t
	t/Group.t
	t/Help/isa.t
	t/International.t
	t/Mail/Send.t
	t/Operation/AdSpace.t
	t/Operation/Auth.t
	t/Pluggable.t
	t/Session.t
	t/Session/DateTime.t
	t/Session/ErrorHandler.t
	t/Session/Scratch.t
	t/Session/Stow.t
	t/Shop/Cart.t
	t/Shop/Pay.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/PayPalStd.t
	t/Shop/Ship.t
	t/Shop/ShipDriver.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Shop/Transaction.t
	t/Shop/Vendor.t
	t/VersionTag.t
	t/Workflow/Activity/ArchiveOldStories.t
	t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
	t/lib/WebGUI/Test.pm

t/Asset/Wobject/Survey/ExpressionEngine.t

@@ -28,9 +28,11 @@ plan tests => $tests + 1;
 #----------------------------------------------------------------------------
 # put your tests here
 
-my $e = "WebGUI::Asset::Wobject::Survey::ExpressionEngine";
-use_ok($e);
+my $usedOk = use_ok('WebGUI::Asset::Wobject::Survey::ExpressionEngine');
 
+my $e = "WebGUI::Asset::Wobject::Survey::ExpressionEngine";
+
+WebGUI::Test->originalConfig('enableSurveyExpressionEngine');
 $session->config->set( 'enableSurveyExpressionEngine', 0 );
 is( $e->run( $session, 'jump { 1 } target' ),
     undef, "Nothing happens unless we turn on enableSurveyExpressionEngine in config" );
@@ -240,6 +242,7 @@ cmp_deeply( $e->run( $session, qq{jump {taggedX('$url', ext_tag) == 199} target}
 {
     # Create a second test user
     my $survey2 = WebGUI::Asset::Wobject::Survey->new($session, $survey->getId);
+    WebGUI::Test->addToCleanup($survey2);
     my $user2 = WebGUI::User->new( $session, 'new' );
     WebGUI::Test->addToCleanup($user2);
     $session->user({userId => $user2->userId});
@@ -261,3 +264,5 @@ cmp_deeply( $e->run( $session, qq{jump {taggedX('$url', ext_tag) == 199} target}
     cmp_deeply( $e->run( $session, qq{jump {taggedX('$url', ext_tag) == 199} target}, {userId => $user->userId} ),
         { jump => 'target', tags => {} }, 'first external tag lookups still works' );
 }
+
+#vim:ft=perl

t/Asset/Wobject/Survey/Reports.t

@@ -36,6 +36,7 @@ my $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey
 $survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
+WebGUI::Test->addToCleanup($survey);
 isa_ok($survey, 'WebGUI::Asset::Wobject::Survey');
 
 my $sJSON = $survey->getSurveyJSON;
@@ -125,11 +126,4 @@ superhashof({
 })]);
 
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $survey->purge() if $survey;
-
-    my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 );
-    $versionTag->rollback() if $versionTag;
-}
+#vim:ft=perl

t/Asset/Wobject/Survey/Test.t

@@ -23,8 +23,6 @@ my $session = WebGUI::Test->session;
 # Tests
 plan tests => 94;
 
-my ( $s, $t1 );
-
 my $tp = use_ok('TAP::Parser');
 my $tpa = use_ok('TAP::Parser::Aggregator');
 
@@ -39,8 +37,9 @@ my $import_node = WebGUI::Asset->getImportNode($session);
 $session->config->set('enableSurveyExpressionEngine', 1);
 
 # Create a Survey
-$s = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
+my $s = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
 isa_ok( $s, 'WebGUI::Asset::Wobject::Survey' );
+WebGUI::Test->addToCleanup($s);
 
 my $tag = WebGUI::VersionTag->getWorking($session);
 $tag->commit;
@@ -155,7 +154,8 @@ cmp_deeply(
     'surveyOrderIndex correct'
 );
 
-$t1 = WebGUI::Asset::Wobject::Survey::Test->create( $session, { assetId => $s->getId } );
+my $t1 = WebGUI::Asset::Wobject::Survey::Test->create( $session, { assetId => $s->getId } );
+WebGUI::Test->addToCleanup(sub {$t1->delete();});
 my $spec;
 
 # No tests
@@ -726,9 +726,4 @@ Hashes differ on element: a
 expect : '2'
 END_CMP
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $s->purge() if $s;
-    $t1->delete() if $t1;
-}
+#vim:ft=perl