Merge branch 'master' into WebGUI8

t/Asset/WikiPage.t

@@ -16,7 +16,8 @@ use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
 use WebGUI::Session;
-use Test::More tests => 17; # increment this value for each test you create
+use Test::More tests => 29; # increment this value for each test you create
+use Test::Deep;
 use WebGUI::Asset::Wobject::WikiMaster;
 use WebGUI::Asset::WikiPage;
 
@@ -27,12 +28,12 @@ my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Wiki Test"});
 addToCleanup($versionTag);
 
-my $wiki = $node->addChild({className=>'WebGUI::Asset::Wobject::WikiMaster'});
+my $wiki = $node->addChild({className=>'WebGUI::Asset::Wobject::WikiMaster', title => 'Wiki Test', url => 'wikitest'});
+my @autoCommitCoda = (undef, undef, {skipAutoCommitWorkflows => 1, skipNotification => 1});
 $versionTag->commit;
 my $wikipage = $wiki->addChild(
     {className=>'WebGUI::Asset::WikiPage'},
-    undef, undef,
-    {skipAutoCommitWorkflows => 1, skipNotification => 1}
+    @autoCommitCoda,
 );
 
 # Wikis create and autocommit a version tag when a child is added.  Lets get the name so we can roll it back.
@@ -90,3 +91,55 @@ $comments = $wikipage->get('comments');
 is($comments->[0]{comment}, $secondComment, "you can delete a comment");
 is($wikipage->get('averageCommentRating'), 1, 'average rating is adjusted after deleting a comment');
 
+
+##################
+# This section tests hierarchical keywords support
+##################
+
+#
+## setup some more wiki pages
+my $properties = {
+    className=>'WebGUI::Asset::WikiPage',
+    content => 'Now is the time for all good men to come to the aid of their country',
+    title => 'Keyword',
+    keywords => 'keyword'
+};
+my $wikipage2 = $wiki->addChild($properties, @autoCommitCoda);
+isa_ok($wikipage2, 'WebGUI::Asset::WikiPage');
+
+$properties = {
+    className=>'WebGUI::Asset::WikiPage',
+    content => 'The quick brown fox jumps over the lazy dog.',
+    title => 'Fox',
+    keywords => 'keyword'
+};
+my $wikipage3 = $wiki->addChild($properties, @autoCommitCoda);
+isa_ok($wikipage3, 'WebGUI::Asset::WikiPage');
+
+# Test keywords support
+my $keywords = $wikipage2->get('keywords');
+is($keywords,$properties->{'keywords'}, 'Keywords match');
+
+# Test isKeywordPage()
+ok   $wikipage2->isKeywordPage(), "'".$wikipage2->get('title')."' is a keyword page";
+my $templateVars = $wikipage2->getTemplateVars;
+ok   $templateVars->{isKeywordPage}, 'isKeywordPage template var, true';
+cmp_deeply
+    $templateVars->{keyword_page_loop},
+    [
+        { title => 'Fox',     url => '/wikitest/fox', },
+    ],
+    'populated keyword_page_loop, sorted by title';
+ok ! $wikipage3->isKeywordPage(), "'".$wikipage3->get('title')."' is not a keyword page";
+$templateVars = $wikipage3->getTemplateVars;
+ok ! $templateVars->{isKeywordPage}, 'isKeywordPage template var, false';
+cmp_deeply $templateVars->{keyword_page_loop}, [], 'empty keyword_page_loop';
+
+$wikipage3->update({keywords => $wikipage3->get('keywords').',Fox'});
+ok $wikipage3->isKeywordPage(), "'".$wikipage3->get('title')."' is now a keyword page";
+$templateVars = $wikipage3->getTemplateVars;
+ok $templateVars->{isKeywordPage}, 'isKeywordPage template var, false';
+cmp_deeply
+    $templateVars->{keyword_page_loop},
+    [ ],
+    'empty keyword_page_loop, self is not put into the loop';

t/Asset/Wobject/WikiMaster/featured.t

@@ -69,9 +69,5 @@ cmp_deeply(
     "appendFeaturedPageVars returns correct variables, prefixed with 'featured_'",
 );
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
 
-}
 #vim:ft=perl

t/Macro/PageUrl.t

@@ -65,7 +65,3 @@ $output = WebGUI::Macro::PageUrl::process($session, '/sub/page', 'query=this');
 like($output, qr{/sub/page\?noCache=\d+:\d+;query=this$}, 'checking that the query arg works with preventProxyCache');
 
 }
-
-END {
-	# See note in the Slash_gateway macro test about this.
-}

t/Storage.t

@@ -32,7 +32,7 @@ my $cwd = Cwd::cwd();
 
 my ($extensionTests, $fileIconTests) = setupDataDrivenTests($session);
 
-my $numTests = 134; # increment this value for each test you create
+my $numTests = 136; # increment this value for each test you create
 plan tests => $numTests + scalar @{ $extensionTests } + scalar @{ $fileIconTests };
 
 my $uploadDir = $session->config->get('uploadsPath');
@@ -508,7 +508,7 @@ my $shallowDir = $shallowStorage->getPathClassDir();
 ok(-e $shallowDir->file('.wgaccess')->stringify, 'setPrivilege: .wgaccess file created in shallow storage');
 my $privs;
 $privs = $shallowStorage->getFileContentsAsScalar('.wgaccess');
-is ($privs, "3\n3\n3", '... correct group contents');
+is ($privs, '{"assets":[],"groups":["3","3"],"users":["3"]}', '... correct group contents');
 $shallowStorage->deleteFile('.wgaccess');
 
 my $deepStorage = WebGUI::Storage->create($session);
@@ -524,9 +524,21 @@ ok(-e $deepDir->file('.wgaccess')->stringify,     '.wgaccess file created in dee
 ok(-e $deepDeepDir->file('.wgaccess')->stringify, '.wgaccess file created in deep storage subdir');
 
 $privs = $deepStorage->getFileContentsAsScalar('.wgaccess');
-is ($privs, "3\n3\n3", '... correct group contents, deep storage');
+is ($privs, '{"assets":[],"groups":["3","3"],"users":["3"]}', '... correct group contents, deep storage');
 $privs = $deepStorage->getFileContentsAsScalar('deep/.wgaccess');
-is ($privs, "3\n3\n3", '... correct group contents, deep storage subdir');
+is ($privs, '{"assets":[],"groups":["3","3"],"users":["3"]}', '... correct group contents, deep storage subdir');
+
+{
+    my $storage = WebGUI::Storage->create($session);
+    addToCleanup($storage);
+    my $asset = WebGUI::Asset->getRoot($session);
+    $storage->setPrivileges( $asset );
+    my $accessFile = $storage->getPathClassDir->file('.wgaccess');
+    ok(-e $accessFile, 'setPrivilege: .wgaccess file created for asset permissions');
+    my $privs = $accessFile->slurp;
+    is ($privs, '{"assets":["' . $asset->getId . '"],"groups":[],"users":[]}', '... correct asset contents');
+}
+
 
 ####################################################
 #

t/VersionTag.t

@@ -14,7 +14,7 @@ use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::VersionTag;
-use Test::More tests => 74; # increment this value for each test you create
+use Test::More tests => 81; # increment this value for each test you create
 
 my $session = WebGUI::Test->session;
 
@@ -105,14 +105,36 @@ $tag->clearWorking;
 ok(!defined getWorking(1), 'working tag unset');
 
 ok(!scalar $tag->get('isLocked'), 'tag is initially unlocked');
+ok(!$tag->isLocked,'accessor for isLocked works on false');
 $tag->lock;
 ok(scalar $tag->get('isLocked'), 'tag is locked');
+ok($tag->isLocked, 'accessor for isLocked works on true');
 ok_open($tag->getId, 0, 'locked tag');
 $tag->unlock;
 ok(!scalar $tag->get('isLocked'), 'tag is again unlocked');
 ok_open($tag->getId, 1, 'unlocked tag');
 
-# TODO: test interaction between lock/unlock and working tags
+# test interaction between lock/unlock and working tags
+my $locker = WebGUI::VersionTag->create($session);
+$locker->setWorking();
+is getWorking(1), $locker, 'working tag is the one we are about to lock';
+
+$locker->lock();
+ok !defined getWorking(1), 'lock clears working';
+
+my $unlocked = WebGUI::VersionTag->create($session);
+$unlocked->setWorking();
+is getWorking(1), $unlocked, 'working tag is fresh';
+$locker->setWorking();
+is getWorking(1), $unlocked, 'setWorking on locked tag does nothing';
+$unlocked->clearWorking;
+$unlocked->rollback;
+
+$session->stow->set(versionTag => $locker);
+$session->scratch->set(versionTag => $locker->getId);
+isnt getWorking(1), $locker, 'getWorking never returns locked tag';
+$locker->clearWorking;
+$locker->rollback;
 
 my $tagAgain1 = WebGUI::VersionTag->new($session, $tag->getId);
 isa_ok($tagAgain1, 'WebGUI::VersionTag', 'tag retrieved again while valid');