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

Merge branch 'master' into WebGUI8. Merged up to 7.9.12

Browse source
This commit is contained in:
Colin Kuskie 2010-08-13 12:25:19 -07:00
commit 3e8e2d452c
27 changed files with 333 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
t/Asset/Wobject/Matrix.t
View file

@ -135,6 +135,8 @@ is($matrixListing->get('views'),'1','Views were incremented');
# Test getListings
my $expectedAssetId = $matrixListing->getId;
my $safeAssetId = $expectedAssetId;
$safeAssetId =~ s/-/_____/;
my $listings = $matrix->getListings;
@ -209,19 +211,19 @@ cmp_deeply(
$compareListData,
{ResultSet=>{
Result=>[
{$expectedAssetId=>$matrixListingLastUpdatedHuman,fieldType=>"lastUpdated",name=>"Last Updated"},
{fieldType=>"category",name=>"category1",$expectedAssetId=>$matrixListing->get('title').' '},
{fieldType=>"category",name=>"category2",$expectedAssetId=>$matrixListing->get('title').' '}
{$safeAssetId=>$matrixListingLastUpdatedHuman,fieldType=>"lastUpdated",name=>"Last Updated"},
{fieldType=>"category",name=>"category1",$safeAssetId=>$matrixListing->get('title').' '},
{fieldType=>"category",name=>"category2",$safeAssetId=>$matrixListing->get('title').' '}
]
},
ColumnDefs=>[{
key =>$expectedAssetId,
key =>$safeAssetId,
label =>$matrixListing->get('title').' '.$matrixListing->get('version'),
formatter =>"formatColors",
url =>$matrixListing->getUrl,
lastUpdated =>$matrixListingLastUpdatedHuman,
}],
ResponseFields=>["attributeId", "name", "description","fieldType", "checked",$expectedAssetId,$expectedAssetId."_compareColor"]
ResponseFields=>["attributeId", "name", "description","fieldType", "checked",$safeAssetId,$safeAssetId."_compareColor"]
},
'Getting compareListData as JSON'
);

2
t/Asset/Wobject/SyndicatedContent.t
View file

@ -51,7 +51,7 @@ isa_ok($syndicated_content, 'WebGUI::Asset::Wobject::SyndicatedContent');
my $newSyndicatedContentSettings = {
cacheTimeout => 124,
templateId => "PBtmpl0000000000000065",
rssUrl => 'http://svn.webgui.org/svnweb/plainblack/rss/WebGUI/',
rssUrl => 'http://github.com/plainblack/webgui/commits/master.atom',
};
# update the new values for this instance