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/Template.t

@@ -18,6 +18,7 @@ use WebGUI::Asset::Template;
 use Exception::Class;
 use Test::More tests => 42; # increment this value for each test you create
 use Test::Deep;
+use Data::Dumper;
 use JSON qw{ from_json };
 
 my $session = WebGUI::Test->session;
@@ -78,13 +79,13 @@ my $template3 = $importNode->addChild({
 }, undef, time()-5);
 
 my @atts = (
-    {type => 'headScript', sequence => 1, url => 'bar'},
-    {type => 'headScript', sequence => 0, url => 'foo'},
-    {type => 'stylesheet', sequence => 0, url => 'style'},
-    {type => 'bodyScript', sequence => 0, url => 'body'},
+    {type => 'headScript', url => 'foo'},
+    {type => 'headScript', url => 'bar'},
+    {type => 'stylesheet', url => 'style'},
+    {type => 'bodyScript', url => 'body'},
 );
 
-$template3->addAttachments(\@atts);
+$template3->update({ attachmentsJson => JSON->new->encode( \@atts ) });
 my $att3 = $template3->getAttachments('headScript');
 is($att3->[0]->{url}, 'foo', 'has foo');
 is($att3->[1]->{url}, 'bar', 'has bar');
@@ -100,12 +101,12 @@ ok(exists $session->style->{_javascript}->{$_}, "$_ in style") for qw(foo bar bo
 #sleep 1;
 
 my $template3dup = $template3->duplicate;
-my @atts3dup = map { delete @{ $_ }{qw/attachId templateId revisionDate/}; $_; } @{ $template3dup->getAttachments };
+my @atts3dup = @{ $template3dup->getAttachments };
 cmp_bag(
     [@atts3dup],
     [@atts],
     'attachments are duplicated'
-);
+) or diag( Dumper \@atts3dup );
 
 my $template3rev = $template3->addRevision();
 my $att4 = $template3rev->getAttachments('headScript');
@@ -113,7 +114,9 @@ is($att4->[0]->{url}, 'foo', 'rev has foo');
 is($att4->[1]->{url}, 'bar', 'rev has bar');
 is(@$att4, 2, 'rev is proper size');
 
-$template3rev->addAttachments([{type => 'headScript', sequence => 2, url => 'baz'}]);
+$template3rev->update({ 
+    attachmentsJson => JSON->new->encode([ @atts, {type => 'headScript', url => 'baz'} ]),
+});
 $att4 = $template3rev->getAttachments('headScript');
 $att3 = $template3->getAttachments('headScript');
 is($att3->[0]->{url}, 'foo', 'original still has foo');
@@ -122,13 +125,9 @@ is(@$att3, 2, 'original does not have new thing');
 
 is($att4->[0]->{url}, 'foo', 'rev still has foo');
 is($att4->[1]->{url}, 'bar', 'rev still has bar');
-is($att4->[2]->{url}, 'baz', 'rev does have new thing');
+is($att4->[2]->{url}, 'baz', 'rev does have new thing') or diag( $template3rev->get('attachmentsJson') );
 is(@$att4, 3, 'rev is proper size');
 
-##This is a non-test.  Duplicate URLs will not cause the test to blow-up with
-##an untrappable error.
-$template3rev->addAttachments([{ type => 'headScript', sequence => 3, url => 'baz'}]);
-
 $template3rev->purgeRevision();
 
 ## Check how templates in the trash and clipboard are handled.