oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '41575d24bb' into webgui8. Some tests still failing.

Browse source 
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/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm
This commit is contained in:
Colin Kuskie 2010-06-25 23:25:26 -07:00
commit 5febc0ebbc
258 changed files with 5528 additions and 2230 deletions
Download patch file Download diff file Expand all files Collapse all files

6
t/Asset/Wobject/StoryArchive.t
View file

@ -548,6 +548,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'Story 2',
@ -555,6 +557,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'Story 3',
@ -562,6 +566,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
],
'rssFeedItems'

6
t/Asset/Wobject/StoryTopic.t
View file

@ -297,6 +297,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'red',
@ -304,6 +306,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
{
title => 'brooks',
@ -311,6 +315,8 @@ cmp_deeply(
'link' => ignore(),
date => ignore(),
author => ignore(),
pubDate => ignore(),
guid => ignore(),
},
],
'rssFeedItems'

42
t/Asset/Wobject/WikiMaster.t
View file

@ -85,8 +85,9 @@ my $variables = $wiki->getKeywordVariables($hierarchy);
cmp_deeply(
$hierarchy->[0],
{
title => 'criminals',
url => '/testwiki/criminals',
title => 'criminals',
url => '/testwiki?func=byKeyword;keyword=criminals',
descendants => 0,
},
"getKeywordVariables, does not alter the original hierarchy passed in",
);
@ -96,21 +97,27 @@ cmp_deeply(
[
{
title => 'criminals',
url => '/testwiki/criminals',
url => '/testwiki?func=byKeyword;keyword=criminals',
level => 0,
indent_loop => [],
descendants => 0,
isTopLevel => 1,
},
{
title => 'inmates',
url => '/testwiki/inmates',
url => '/testwiki?func=byKeyword;keyword=inmates',
level => 0,
indent_loop => [],
descendants => 0,
isTopLevel => 1,
},
{
title => 'staff',
url => '/testwiki/staff',
url => '/testwiki?func=byKeyword;keyword=staff',
level => 0,
indent_loop => [],
descendants => 0,
isTopLevel => 1,
},
],
"... variables",
@ -133,9 +140,9 @@ cmp_deeply(
);
$wiki->update({topLevelKeywords => 'criminals,inmates,staff'});
$page_set{criminals}->update({keywords => 'red,andy'});
$page_set{inmates}->update({keywords => 'brooks,heywood'});
$page_set{staff}->update({keywords => 'norton,hadley'});
$wiki->setSubKeywords('criminals', 'red', 'andy');
$wiki->setSubKeywords('inmates', 'brooks', 'heywood');
$wiki->setSubKeywords('staff', 'norton', 'hadley');
foreach my $title (qw/red andy brooks heywood norton hadley/) {
$page_set{$title} = $wiki->addChild({
@ -152,33 +159,36 @@ cmp_bag(
$wiki->getKeywordHierarchy(),
[
{
title => 'criminals', url => '/testwiki/criminals',
title => 'criminals', url => '/testwiki?func=byKeyword;keyword=criminals',
children => bag(
superhashof({ title => 'red', }),
superhashof({ title => 'andy', }),
),
descendants => 0,
},
{
title => 'inmates', url => '/testwiki/inmates',
title => 'inmates', url => '/testwiki?func=byKeyword;keyword=inmates',
children => bag(
superhashof({ title => 'heywood', }),
superhashof({ title => 'brooks', }),
),
descendants => 0,
},
{
title => 'staff', url => '/testwiki/staff',
title => 'staff', url => '/testwiki?func=byKeyword;keyword=staff',
children => bag(
superhashof({ title => 'norton', }),
superhashof({ title => 'hadley', }),
),
descendants => 0,
},
],
"getKeywordHierarchy: simple hierarchy",
);
##Check depth-first display, and try to make a keyword loop
$page_set{andy}->update({keywords => 'criminals,inmates'});
$page_set{brooks}->update({keywords => 'criminals'});
$wiki->setSubKeywords('andy', 'criminals', 'inmates');
$wiki->setSubKeywords('brooks', 'criminals');
my $tag_set3 = WebGUI::VersionTag->getWorking($session);
$tag_set3->commit;
@ -238,9 +248,9 @@ cmp_deeply(
},
]),
[
{ title => 'title 0', url => 'url 0', level => 0, indent_loop => [], },
{ title => 'title 1', url => 'url 1', level => 1, indent_loop => [{indent => 1}], },
{ title => 'title 2', url => 'url 2', level => 2, indent_loop => [{indent => 1,}, {indent => 2,},], },
{ title => 'title 0', url => 'url 0', level => 0, isTopLevel => 1, indent_loop => [], },
{ title => 'title 1', url => 'url 1', level => 1, isTopLevel => '', indent_loop => [{indent => 1}], },
{ title => 'title 2', url => 'url 2', level => 2, isTopLevel => '', indent_loop => [{indent => 1,}, {indent => 2,},], },
],
'getKeywordVariables: checking deeply'
);