diff --git a/lib/WebGUI/AssetHelper/Lock.pm b/lib/WebGUI/AssetHelper/Lock.pm index 131846d7b..628f0bd80 100644 --- a/lib/WebGUI/AssetHelper/Lock.pm +++ b/lib/WebGUI/AssetHelper/Lock.pm @@ -2,6 +2,7 @@ package WebGUI::AssetHelper::Lock; use strict; use Class::C3; +use WebGUI::International; use base qw/WebGUI::AssetHelper/; =head1 LEGAL @@ -18,7 +19,7 @@ use base qw/WebGUI::AssetHelper/; =head1 NAME -Package WebGUI::AssetHelper::Locks +Package WebGUI::AssetHelper::Lock =head1 DESCRIPTION @@ -52,7 +53,6 @@ sub process { } $asset = $asset->addRevision; - return { message => sprintf($i18n->get('locked asset'), $asset->getTitle), }; diff --git a/t/AssetHelper/Lock.t b/t/AssetHelper/Lock.t index 0ce0c236e..0d0145ca0 100644 --- a/t/AssetHelper/Lock.t +++ b/t/AssetHelper/Lock.t @@ -27,12 +27,6 @@ use WebGUI::AssetHelper::Lock; # Init my $session = WebGUI::Test->session; - -#---------------------------------------------------------------------------- -# Tests - -plan tests => 3; # Increment this number for each test you create - #---------------------------------------------------------------------------- # put your tests here @@ -54,7 +48,7 @@ my $versionTag = WebGUI::VersionTag->getWorking($session); $versionTag->commit; addToCleanup($versionTag); -$newPage = $newPage->cloneFromDb; +$newPage = WebGUI::Asset->newById($session, $newPage->assetId); $session->user({userId => 1}); $output = WebGUI::AssetHelper::Lock->process($newPage); @@ -76,11 +70,13 @@ cmp_deeply( '... locks the asset' ); -$newPage = $newPage->cloneFromDb; - my $versionTag2 = WebGUI::VersionTag->getWorking($session); addToCleanup($versionTag2); +$newPage = WebGUI::Asset->newById($session, $newPage->assetId); +ok $newPage->isLocked, 'Asset is locked, and ready for next test'; +is $newPage->getRevisionCount, 2, 'new revision added'; + $session->user({userId => $editor->getId}); $output = WebGUI::AssetHelper::Lock->process($newPage); cmp_deeply( @@ -90,3 +86,5 @@ cmp_deeply( }, '... returns an error message if the asset is already locked' ); + +done_testing;