Merge commit '4635b91554' into WebGUI8. Syntax clean up to 7.10.2

t/Asset/Event.t

@@ -127,24 +127,6 @@ isnt($event6a->get('storageId'), $event6->get('storageId'), '... and it is diffe
 
 my $versionTag2 = WebGUI::VersionTag->getWorking($session);
 WebGUI::Test->addToCleanup($versionTag2);
-$versionTag2->commit;
-
-my $event7 = $cal->addChild(
-    {
-        className => 'WebGUI::Asset::Event',
-        assetId   => 'EventAssetTestStorage6',
-        url       => 'hidden_event',
-    }, undef, undef, { skipNotifications => 1, skipAutoCommitWorkflows => 1 },
-);
-
-my $tag = WebGUI::VersionTag->getWorking($session);
-$tag->commit;
-addToCleanup($tag);
-
-is $event7->isHidden, 1, 'isHidden set to 1 by default';
-
-$event7->isHidden(0);
-is $event7->isHidden, 1, 'isHidden cannot be set to 0';
 
 my $event7 = $cal->addChild({
     className => 'WebGUI::Asset::Event',

t/Asset/File/ZipArchive.t

@@ -10,11 +10,12 @@
 
 use strict;
 
+use WebGUI::Test;
+
 use WebGUI::Storage;
 use WebGUI::Asset;
 use WebGUI::Asset::File::ZipArchive;
 
-use WebGUI::Test;
 use Test::More; # increment this value for each test you create
 use Test::Deep;
 plan tests => 3;

t/Asset/Template.t

@@ -15,7 +15,6 @@ use WebGUI::Session;
 use WebGUI::Asset::Template;
 use Exception::Class;
 
-use Test::More;
 use Test::Deep;
 use Data::Dumper;
 use Test::Exception;

t/Asset/Wobject/WikiMaster/search.t

@@ -0,0 +1,67 @@
+# vim:syntax=perl
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#------------------------------------------------------------------
+
+# Test the featured page of the Wiki
+# 
+#
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../../../lib";
+use Test::More;
+use Test::Deep;
+use WebGUI::Test; # Must use this before any other WebGUI modules
+use WebGUI::Session;
+
+#----------------------------------------------------------------------------
+# Init
+my $session         = WebGUI::Test->session;
+my $import          = WebGUI::Asset->getImportNode( $session );
+
+my $templateId = 'WIKIMASTER_TEMPLATE___';
+
+my $templateMock = Test::MockObject->new({});
+$templateMock->set_isa('WebGUI::Asset::Template');
+$templateMock->set_always('getId', $templateId);
+my $templateVars;
+$templateMock->mock('process', sub { $templateVars = $_[1]; } );
+
+my $wiki
+    = $import->addChild( {
+        className        => 'WebGUI::Asset::Wobject::WikiMaster',
+        searchTemplateId => $templateId,
+    } );
+
+WebGUI::Test->addToCleanup($wiki);
+
+#----------------------------------------------------------------------------
+# Tests
+
+plan tests => 1;        # Increment this number for each test you create
+
+$session->request->setup_body({
+    query => 'Red&Andy',
+});
+
+{
+    WebGUI::Test->mockAssetId($templateId, $templateMock);
+    $wiki->www_search();
+    WebGUI::Test->unmockAssetId($templateId);
+}
+
+is $templateVars->{addPageUrl},
+    $wiki->getUrl('func=add;class=WebGUI::Asset::WikiPage;title=Red%26Andy'),
+    'search encodes unsafe characters in addPageUrl';
+
+#----------------------------------------------------------------------------
+# 
+
+#vim:ft=perl