From dd771bd409648d4358c7b9db56f56e2a9aba8087 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 18 Mar 2009 18:27:04 +0000 Subject: [PATCH] Check for addStoryUrl with the right permissions. Move all stories into the past, in preparation for filtering out future Stories based on canEdit. --- t/Asset/Wobject/StoryArchive.t | 54 ++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/t/Asset/Wobject/StoryArchive.t b/t/Asset/Wobject/StoryArchive.t index 9a17dc801..08a16d592 100644 --- a/t/Asset/Wobject/StoryArchive.t +++ b/t/Asset/Wobject/StoryArchive.t @@ -59,7 +59,7 @@ $canPostMaker->prepare({ }); my $tests = 1; -plan tests => 27 +plan tests => 28 + $tests + $canPostMaker->plan ; @@ -162,11 +162,11 @@ is($folder->getFirstChild->getTitle, 'First Story', '... and it is the correct c my $wgBday = 997966800; my $oldFolder = $archive->getFolder($wgBday); -my $tomorrow = $now+24*3600; -my $newFolder = $archive->getFolder($tomorrow); +my $yesterday = $now-24*3600; +my $newFolder = $archive->getFolder($yesterday); -my ($wgBdayMorn,undef) = $session->datetime->dayStartEnd($wgBday); -my ($tomorrowMorn,undef) = $session->datetime->dayStartEnd($tomorrow); +my ($wgBdayMorn,undef) = $session->datetime->dayStartEnd($wgBday); +my ($yesterdayMorn,undef) = $session->datetime->dayStartEnd($yesterday); my $story = $oldFolder->addChild({ className => 'WebGUI::Asset::Story', title => 'WebGUI is released', keywords => 'roger foxtrot echo'}); $session->db->write('update asset set creationDate=997966800 where assetId=?',[$story->getId]); @@ -176,8 +176,8 @@ $session->db->write('update asset set creationDate=997966800 where assetId=?',[$ is ($storyDB->get('status'), 'approved', 'addRevision always calls for an autocommit'); } -my $futureStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', title => "There's always tomorrow" }); -$session->db->write("update asset set creationDate=$tomorrow where assetId=?",[$futureStory->getId]); +my $pastStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', title => "Yesterday is history" }); +$session->db->write("update asset set creationDate=$yesterday where assetId=?",[$pastStory->getId]); my $templateVars; $templateVars = $archive->viewTemplateVariables(); @@ -191,16 +191,8 @@ cmp_deeply( { canPostStories => 0, mode => 'view', - addStoryUrl => '/home/mystories?func=add;class=WebGUI::Asset::Story', + addStoryUrl => '', date_loop => [ - { - epochDate => $tomorrowMorn, - story_loop => [{ - creationDate => $tomorrow, - url => re('theres-always-tomorrow'), - title => "There's always tomorrow", - }, ], - }, { epochDate => ignore(), story_loop => [ { @@ -209,6 +201,14 @@ cmp_deeply( title => 'First Story', }, ], }, + { + epochDate => $yesterdayMorn, + story_loop => [{ + creationDate => $yesterday, + url => re('yesterday-is-history'), + title => "Yesterday is history", + }, ], + }, { epochDate => $wgBdayMorn, story_loop => [ { @@ -246,14 +246,6 @@ cmp_deeply( canPostStories => 1, addStoryUrl => '/home/mystories?func=add;class=WebGUI::Asset::Story', date_loop => [ - { - epochDate => $tomorrowMorn, - story_loop => [{ - creationDate => $tomorrow, - url => re('theres-always-tomorrow'), - title => "There's always tomorrow", - }, ], - }, { epochDate => ignore(), story_loop => [ @@ -267,13 +259,23 @@ cmp_deeply( url => ignore(), title => 'Story 2', }, + { + creationDate => ignore(), + url => ignore(), + title => 'Story 3', + }, ], }, - ] + ], }, - 'viewTemplateVariables: returns expected template variables with 3 stories in different folders' + 'viewTemplateVariables: returns expected template variables with several stories in 3 different folders' ); +TODO: { + local $TODO = "viewTemplateVariables code to write"; + ok(0, 'Check that Stories from the future are not displayed unless the user canEdit this StoryArchive'); +} + ################################################################ # # viewTemplateVariables, keywords search mode