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

more tests and some code cleanup

Browse source
This commit is contained in:
Doug Bell 2010-10-28 13:50:26 -05:00
parent 1bed8706d6
commit cd4845768f
2 changed files with 141 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Admin.pm
View file

@ -573,15 +573,10 @@ sub www_getTreeData {
lockedBy => ($asset->isLockedBy ? $asset->lockedBy->username : ''),
canEdit => $asset->canEdit && $asset->canEditIfLocked,
helpers => $asset->getHelpers,
icon => $asset->getIcon("small"),
className => $asset->getName,
);
$fields{ className } = {};
# The asset icon
$fields{ icon } = $asset->getIcon("small");
# The asset type (i18n name)
$fields{ className } = $asset->getName;
push @{ $assetInfo->{ assets } }, \%fields;
}
@ -726,15 +721,10 @@ sub www_searchAssets {
lockedBy => ($asset->isLockedBy ? $asset->lockedBy->username : ''),
canEdit => $asset->canEdit && $asset->canEditIfLocked,
helpers => $asset->getHelpers,
icon => $asset->getIcon('small'),
className => $asset->getName,
);
$fields{ className } = {};
# The asset icon
$fields{ icon } = $asset->getIcon("small");
# The asset type (i18n name)
$fields{ className } = $asset->getName;
push @{ $assetInfo->{ assets } }, \%fields;
}

138
t/Admin.t
View file

@ -50,6 +50,7 @@ BEGIN { $INC{'WebGUI/Admin/Plugin/Test.pm'} = __FILE__; }
my $session = WebGUI::Test->session;
$session->user({ userId => 3 });
my $import = WebGUI::Asset->getImportNode( $session );
# Add a couple admin plugins to the config file
WebGUI::Test->originalConfig( "adminConsole" );
$session->config->addToHash('adminConsole', 'test', {
@ -60,10 +61,12 @@ $session->config->addToHash('adminConsole', 'test2', {
} );
# Add some assets
my $snip = WebGUI::Asset->getImportNode( $session )->addChild( {
my $snip = $import->addChild( {
className => 'WebGUI::Asset::Snippet',
title => 'test',
groupIdEdit => '3',
synopsis => "aReallyLongWordToGetIndexed",
keywords => "AKeywordToGetIndexed",
} );
# Commit the tag
@ -71,6 +74,9 @@ my $tag = WebGUI::VersionTag->getWorking( $session );
$tag->commit;
addToCleanup( $tag );
# Reload snippet to get correct size
$snip = $snip->cloneFromDb;
#----------------------------------------------------------------------------
# Tests
@ -109,6 +115,136 @@ cmp_deeply(
'found the Admin user',
) || diag( $output );
# www_getClipboard
$snip->cut;
$mech->get_ok( '/?op=admin;method=getClipboard' );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
superbagof({
assetId => $snip->getId,
url => $snip->getUrl,
title => $snip->menuTitle,
revisionDate => $snip->revisionDate,
icon => $snip->getIcon("small"),
}),
'getClipboard found our snippet',
);
# www_getCurrentVersionTag
# no current tag
$mech->get_ok( '/?op=admin;method=getCurrentVersionTag' );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
{ },
'www_getCurrentVersionTag no current version tag',
);
ok( !WebGUI::VersionTag->getWorking( $mech->session, "nocreate" ), "doesn't create a tag" );
# current tag
my $newtag = WebGUI::VersionTag->getWorking( $mech->session );
addToCleanup( $newtag );
$mech->get_ok( '/?op=admin;method=getCurrentVersionTag' );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
{
tagId => $newtag->getId,
name => $newtag->get('name'),
editUrl => $newtag->getEditUrl,
commitUrl => $newtag->getCommitUrl,
leaveUrl => '?op=leaveVersionTag',
},
'www_getCurrentVersionTag',
);
# www_getVersionTags
$mech->get_ok( '/?op=admin;method=getVersionTags' );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
superbagof( {
tagId => $newtag->getId,
name => $newtag->get("name"),
isCurrent => 1,
joinUrl => $newtag->getJoinUrl,
editUrl => $newtag->getEditUrl,
icon => $session->url->extras( 'icon/tag_green.png' ),
} ),
'www_getVersionTags',
);
# www_getTreeData
$mech->get_ok( '/?op=admin;method=getTreeData;assetUrl=' . $import->url );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
{
totalAssets => $import->getChildCount,
sort => ignore(),
dir => ignore(),
assets => [
map { {
assetId => $_->getId,
url => $_->getUrl,
lineage => $_->lineage,
title => $_->menuTitle,
revisionDate => $_->revisionDate,
childCount => $_->getChildCount,
assetSize => $_->assetSize,
lockedBy => ($_->isLockedBy ? $_->lockedBy->username : ''),
canEdit => $_->canEdit && $_->canEditIfLocked,
helpers => $_->getHelpers,
icon => $_->getIcon("small"),
className => $_->getName,
} } @{ $import->getLineage( ['children'], { returnObjects => 1, maxAssets => 25 } ) }
],
currentAsset => {
assetId => $import->getId,
url => $import->getUrl,
title => $import->getTitle,
icon => $import->getIcon("small"),
helpers => $import->getHelpers,
},
crumbtrail => [
map { { title => $_->getTitle, url => $_->getUrl } }
@{ $import->getLineage( ['ancestors'], { returnObjects => 1 } ) }
],
},
'www_getTreeData',
);
# www_searchAssets
$mech->get_ok( '/?op=admin;method=searchAssets;query=aReallyLongWordToGetIndexed' );
$output = $mech->content;
cmp_deeply(
JSON->new->decode( $output ),
{
totalAssets => 1,
sort => undef,
dir => "",
assets => [
{
assetId => $snip->getId,
url => $snip->getUrl,
lineage => $snip->lineage,
title => $snip->menuTitle,
revisionDate => $snip->revisionDate,
childCount => $snip->getChildCount,
assetSize => $snip->assetSize,
lockedBy => ($snip->isLockedBy ? $snip->lockedBy->username : ''),
canEdit => $snip->canEdit && $snip->canEditIfLocked,
helpers => $snip->getHelpers,
icon => $snip->getIcon('small'),
className => $snip->getName,
}
],
},
'www_searchAssets',
);
done_testing;
#vim:ft=perl