Check for addStoryUrl with the right permissions.
Move all stories into the past, in preparation for filtering out future Stories based on canEdit.
This commit is contained in:
parent
e8292a8a3f
commit
dd771bd409
1 changed files with 28 additions and 26 deletions
|
|
@ -59,7 +59,7 @@ $canPostMaker->prepare({
|
||||||
});
|
});
|
||||||
|
|
||||||
my $tests = 1;
|
my $tests = 1;
|
||||||
plan tests => 27
|
plan tests => 28
|
||||||
+ $tests
|
+ $tests
|
||||||
+ $canPostMaker->plan
|
+ $canPostMaker->plan
|
||||||
;
|
;
|
||||||
|
|
@ -162,11 +162,11 @@ is($folder->getFirstChild->getTitle, 'First Story', '... and it is the correct c
|
||||||
my $wgBday = 997966800;
|
my $wgBday = 997966800;
|
||||||
my $oldFolder = $archive->getFolder($wgBday);
|
my $oldFolder = $archive->getFolder($wgBday);
|
||||||
|
|
||||||
my $tomorrow = $now+24*3600;
|
my $yesterday = $now-24*3600;
|
||||||
my $newFolder = $archive->getFolder($tomorrow);
|
my $newFolder = $archive->getFolder($yesterday);
|
||||||
|
|
||||||
my ($wgBdayMorn,undef) = $session->datetime->dayStartEnd($wgBday);
|
my ($wgBdayMorn,undef) = $session->datetime->dayStartEnd($wgBday);
|
||||||
my ($tomorrowMorn,undef) = $session->datetime->dayStartEnd($tomorrow);
|
my ($yesterdayMorn,undef) = $session->datetime->dayStartEnd($yesterday);
|
||||||
|
|
||||||
my $story = $oldFolder->addChild({ className => 'WebGUI::Asset::Story', title => 'WebGUI is released', keywords => 'roger foxtrot echo'});
|
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]);
|
$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');
|
is ($storyDB->get('status'), 'approved', 'addRevision always calls for an autocommit');
|
||||||
}
|
}
|
||||||
|
|
||||||
my $futureStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', title => "There's always tomorrow" });
|
my $pastStory = $newFolder->addChild({ className => 'WebGUI::Asset::Story', title => "Yesterday is history" });
|
||||||
$session->db->write("update asset set creationDate=$tomorrow where assetId=?",[$futureStory->getId]);
|
$session->db->write("update asset set creationDate=$yesterday where assetId=?",[$pastStory->getId]);
|
||||||
|
|
||||||
my $templateVars;
|
my $templateVars;
|
||||||
$templateVars = $archive->viewTemplateVariables();
|
$templateVars = $archive->viewTemplateVariables();
|
||||||
|
|
@ -191,16 +191,8 @@ cmp_deeply(
|
||||||
{
|
{
|
||||||
canPostStories => 0,
|
canPostStories => 0,
|
||||||
mode => 'view',
|
mode => 'view',
|
||||||
addStoryUrl => '/home/mystories?func=add;class=WebGUI::Asset::Story',
|
addStoryUrl => '',
|
||||||
date_loop => [
|
date_loop => [
|
||||||
{
|
|
||||||
epochDate => $tomorrowMorn,
|
|
||||||
story_loop => [{
|
|
||||||
creationDate => $tomorrow,
|
|
||||||
url => re('theres-always-tomorrow'),
|
|
||||||
title => "There's always tomorrow",
|
|
||||||
}, ],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
epochDate => ignore(),
|
epochDate => ignore(),
|
||||||
story_loop => [ {
|
story_loop => [ {
|
||||||
|
|
@ -209,6 +201,14 @@ cmp_deeply(
|
||||||
title => 'First Story',
|
title => 'First Story',
|
||||||
}, ],
|
}, ],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
epochDate => $yesterdayMorn,
|
||||||
|
story_loop => [{
|
||||||
|
creationDate => $yesterday,
|
||||||
|
url => re('yesterday-is-history'),
|
||||||
|
title => "Yesterday is history",
|
||||||
|
}, ],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
epochDate => $wgBdayMorn,
|
epochDate => $wgBdayMorn,
|
||||||
story_loop => [ {
|
story_loop => [ {
|
||||||
|
|
@ -246,14 +246,6 @@ cmp_deeply(
|
||||||
canPostStories => 1,
|
canPostStories => 1,
|
||||||
addStoryUrl => '/home/mystories?func=add;class=WebGUI::Asset::Story',
|
addStoryUrl => '/home/mystories?func=add;class=WebGUI::Asset::Story',
|
||||||
date_loop => [
|
date_loop => [
|
||||||
{
|
|
||||||
epochDate => $tomorrowMorn,
|
|
||||||
story_loop => [{
|
|
||||||
creationDate => $tomorrow,
|
|
||||||
url => re('theres-always-tomorrow'),
|
|
||||||
title => "There's always tomorrow",
|
|
||||||
}, ],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
epochDate => ignore(),
|
epochDate => ignore(),
|
||||||
story_loop => [
|
story_loop => [
|
||||||
|
|
@ -267,13 +259,23 @@ cmp_deeply(
|
||||||
url => ignore(),
|
url => ignore(),
|
||||||
title => 'Story 2',
|
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
|
# viewTemplateVariables, keywords search mode
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue