From 81d811bef1b9b26625e0b0999a490cc9cce89aec Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 14 Jan 2010 15:27:53 -0800 Subject: [PATCH] Add the Topic description to the default Story Topic template. --- docs/changelog/7.x.x.txt | 1 + .../root_import_storymanager_storytopic.wgpkg | Bin 0 -> 1351 bytes t/Asset/Wobject/StoryTopic.t | 35 ++++++------------ 3 files changed, 12 insertions(+), 24 deletions(-) create mode 100644 docs/upgrades/packages-7.8.10/root_import_storymanager_storytopic.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index a78545924..e50fb7414 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,7 @@ - fixed #11345: New Image Asset template does now work well with AssetProxy macro and some layouts - fixed #11344: Badge Builder doesn't allow pagination - fixed #11348: Typ-o in debug notice SQLReport + - fixed #11350: Story Topic asset missing description... 7.8.9 - fixed #11235: wiki search diff --git a/docs/upgrades/packages-7.8.10/root_import_storymanager_storytopic.wgpkg b/docs/upgrades/packages-7.8.10/root_import_storymanager_storytopic.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..6286206b2e23e038994698b0da8bc3bcedf3c469 GIT binary patch literal 1351 zcmV-N1-SYjiwFP!00000|Ls>>a~d}k<~hG&%R?ubF|Z353Z~2u$ByYZiCb`;Ox<|o zT>*+0X-Cq6NhklkM`v#WgZp4J(+BT^!8&Kp{d}LOmiGU+uG?-OmP)ScwGUnM>3Yp( zspRC3Tk^a{z0s~WL9^s|o?EY%9C&5_PpmYN5RxxK#_x9fixrh>x7Z{F4RSK{B73p`(gE)68xD01&gf~^m|ADTdh`OqyNo@+blUy&HX?7>VI|rp+AR*e_p{7 zmNlJ6A<^`PXifatoN}$oPS^SC?*o)8EhL#z`zVqkqEa)8ifG1I3W?Gu_mPmA1_KoF zI1JH>5&M#Yo8axrm?}5Qxd66Mqy2Ie--b-hXix|_U0yLBh$X(|76N*&B{`!c7?Y{G zApRY^WeoSsE;}vI2^_lU#E+%%2_Ti-+5 z+hzS;jTjT?j!hgzm12Td!E==abH+dMelO}5W_`i66rq9_;kcH*XPXF^f@NBbnGPwO z8PZA-8mlix8wzmokKc^uG?drjip4A(QYm2oA33 z?fc8&nG>;`07qxd!}Bt~6>DKfftJ@c;aj2L(1 zoGIA;JVhF+2btx1Z`m|awf)4Bk)KP1#K|<;=$l(6KOVJQ-}<9IQV8Vx75=6f*$8Hhb8j58UWKisxNbbKWF2PHy zP+Q1tEy|p-a_&H4+pd$)nq?g*EvdsMq3xZ{(jbt`(xe}ykVL0gWKE{&oz`!EuAf#; z0_t_X|NiA}F}-T30hN- Jb8!F`0067`l@$O0 literal 0 HcmV?d00001 diff --git a/t/Asset/Wobject/StoryTopic.t b/t/Asset/Wobject/StoryTopic.t index acc029932..5b82bf4cf 100644 --- a/t/Asset/Wobject/StoryTopic.t +++ b/t/Asset/Wobject/StoryTopic.t @@ -31,14 +31,12 @@ my $session = WebGUI::Test->session; #---------------------------------------------------------------------------- # Tests -my $tests = 18; -plan tests => 1 + $tests; +plan tests => 18; #---------------------------------------------------------------------------- # put your tests here my $class = 'WebGUI::Asset::Wobject::StoryTopic'; -my $loaded = use_ok($class); my $versionTag = WebGUI::VersionTag->getWorking($session); @@ -72,13 +70,12 @@ STORY: foreach my $name (@characters) { $storyHandler->{bogs}->update({subtitle => 'drinking his food through a straw'}); -my $topic; - -SKIP: { - - skip "Unable to load module $class", $tests unless $loaded; - -$topic = WebGUI::Asset->getDefault($session)->addChild({ className => 'WebGUI::Asset::Wobject::StoryTopic', title => 'Popular inmates in Shawshank Prison', keywords => join(',', @inmates)}); +my $topic = WebGUI::Asset->getDefault($session)->addChild({ + className => 'WebGUI::Asset::Wobject::StoryTopic', + title => 'Popular inmates in Shawshank Prison', + keywords => join(',', @inmates), + description => 'News from Shawshank', +}); isa_ok($topic, 'WebGUI::Asset::Wobject::StoryTopic', 'made a Story Topic'); $topic->update({ @@ -87,6 +84,7 @@ $topic->update({ }); $versionTag->commit; +addToCleanup($versionTag); ################################################################ # @@ -100,8 +98,9 @@ $templateVars = $topic->viewTemplateVariables(); cmp_deeply( $templateVars, superhashof({ - rssUrl => $topic->getRssFeedUrl, - atomUrl => $topic->getAtomFeedUrl, + rssUrl => $topic->getRssFeedUrl, + atomUrl => $topic->getAtomFeedUrl, + description => 'News from Shawshank', }), 'viewTemplateVars: RSS and Atom feed template variables' ); @@ -311,15 +310,3 @@ cmp_deeply( ], 'rssFeedItems' ); - -} - -#---------------------------------------------------------------------------- -# Cleanup -END { - $archive->purge if $archive; - $topic->purge if $topic; - if ($versionTag) { - $versionTag->rollback; - } -}