add "asset" property to AssetHelpers.
Simplifies the API and allows us to have getForm and getUrl to make asset helpers easier to build.
This commit is contained in:
parent
df31c13e13
commit
698f40a6dd
23 changed files with 216 additions and 123 deletions
|
|
@ -35,7 +35,7 @@ my $asset = WebGUI::Test->asset->addChild( {
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
# Check permissions
|
||||
my $helper = WebGUI::AssetHelper::ChangeUrl->new( id => 'change_url', session => $session );
|
||||
my $helper = WebGUI::AssetHelper::ChangeUrl->new( id => 'change_url', session => $session, asset => $asset );
|
||||
|
||||
$session->user({ userId => 1 });
|
||||
my $output = $helper->process( $asset );
|
||||
|
|
@ -46,7 +46,7 @@ ok( $output->{error}, "Errors on bad permissions" );
|
|||
# Change URL!
|
||||
|
||||
$session->user({ userId => 3 }); # By the power of grayskull!
|
||||
my $output = $helper->process( $asset );
|
||||
my $output = $helper->process;
|
||||
cmp_deeply( $output, {
|
||||
openDialog => all(
|
||||
re( 'method=changeUrl' ),
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@ plan tests => 2; # Increment this number for each test you create
|
|||
|
||||
my $output;
|
||||
$session->setting->set( "versionTagMode" => "autoCommit" );
|
||||
my $helper = WebGUI::AssetHelper::Copy->new( id => 'copy', session => $session );
|
||||
my $home = WebGUI::Asset->getDefault($session);
|
||||
my $root = WebGUI::Asset->getRoot($session);
|
||||
|
||||
{
|
||||
|
||||
$output = $helper->process($home);
|
||||
my $helper = WebGUI::AssetHelper::Copy->new( id => 'copy', session => $session, asset => $home );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ plan tests => 5; # Increment this number for each test you create
|
|||
# put your tests here
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::CopyBranch->new( id => 'copy_branch', session => $session );
|
||||
my $node = WebGUI::Asset->getImportNode($session);
|
||||
my $root = WebGUI::Asset->getRoot( $session );
|
||||
my $tag = WebGUI::VersionTag->getWorking( $session );
|
||||
|
|
@ -60,8 +59,8 @@ $tag->commit;
|
|||
addToCleanup( $tag );
|
||||
|
||||
{
|
||||
|
||||
$output = $helper->process($top);
|
||||
my $helper = WebGUI::AssetHelper::CopyBranch->new( id => 'copy_branch', session => $session, asset => $top );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@ my $session = WebGUI::Test->session;
|
|||
# Tests
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::CreateShortcut->new( id => 'shortcut', session => $session );
|
||||
my $import = WebGUI::Asset->getImportNode($session);
|
||||
|
||||
my $priv_page = WebGUI::Test->asset( groupIdView => '3' );
|
||||
my $helper = WebGUI::AssetHelper::CreateShortcut->new( id => 'shortcut', session => $session, asset => $priv_page );
|
||||
$session->user({userId => 1});
|
||||
$output = $helper->process($priv_page);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -49,7 +49,8 @@ $session->setting->set( versionTagMode => 'autoCommit' );
|
|||
$session->setting->set( skipCommitComments => '1' );
|
||||
$session->user({userId => 3});
|
||||
my $safe_page = WebGUI::Test->asset;
|
||||
$output = $helper->process($safe_page);
|
||||
my $helper = WebGUI::AssetHelper::CreateShortcut->new( id => 'shortcut', session => $session, asset => $safe_page );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@ my $session = WebGUI::Test->session;
|
|||
# Tests
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::Cut->new( id => 'cut', session => $session );
|
||||
my $import = WebGUI::Asset->getImportNode($session);
|
||||
|
||||
$session->user({userId => 1});
|
||||
$output = $helper->process($import);
|
||||
my $helper = WebGUI::AssetHelper::Cut->new( id => 'cut', session => $session, asset => $import );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -45,7 +45,7 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
$session->user({userId => 3});
|
||||
$output = $helper->process($import);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -55,7 +55,8 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
my $safe_page = $import->getFirstChild;
|
||||
$output = $helper->process($safe_page);
|
||||
my $helper = WebGUI::AssetHelper::Cut->new( id => 'cut', session => $session, asset => $safe_page );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@ my $session = WebGUI::Test->session;
|
|||
# Tests
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::Delete->new( id => 'Delete', session => $session );
|
||||
my $import = WebGUI::Asset->getImportNode($session);
|
||||
my $helper = WebGUI::AssetHelper::Delete->new( id => 'Delete', session => $session, asset => $import );
|
||||
|
||||
$session->user({userId => 1});
|
||||
$output = $helper->process($import);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -45,7 +45,7 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
$session->user({userId => 3});
|
||||
$output = $helper->process($import);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -55,7 +55,8 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
my $safe_page = $import->getFirstChild;
|
||||
$output = $helper->process($safe_page);
|
||||
my $helper = WebGUI::AssetHelper::Delete->new( id => 'Delete', session => $session, asset => $safe_page );
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@ plan tests => 2; # Increment this number for each test you create
|
|||
|
||||
my $output;
|
||||
$session->setting->set( "versionTagMode" => "autoCommit" );
|
||||
my $helper = WebGUI::AssetHelper::Duplicate->new( id => 'duplicate', session => $session );
|
||||
my $root = WebGUI::Test->asset;
|
||||
my $test = $root->addChild( { className => 'WebGUI::Asset::Snippet' } );
|
||||
my $helper = WebGUI::AssetHelper::Duplicate->new( id => 'duplicate', session => $session, asset => $test );
|
||||
|
||||
{
|
||||
|
||||
$output = $helper->process($test);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ my $session = WebGUI::Test->session;
|
|||
# Tests
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::EditBranch->new( id => 'edit_branch', session => $session );
|
||||
my $node = WebGUI::Asset->getImportNode($session);
|
||||
my $root = WebGUI::Asset->getRoot( $session );
|
||||
my $top = $node->addChild({
|
||||
|
|
@ -54,8 +53,9 @@ $tag->commit;
|
|||
WebGUI::Test->addToCleanup( $top, $child, $grand );
|
||||
|
||||
{
|
||||
my $helper = WebGUI::AssetHelper::EditBranch->new( id => 'edit_branch', session => $session, asset => $top );
|
||||
|
||||
$output = $helper->process($top);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ my $session = WebGUI::Test->session;
|
|||
$session->user({ userId => 3 });
|
||||
|
||||
my $output;
|
||||
my $helper = WebGUI::AssetHelper::ExportHtml->new( id => 'export_html', session => $session );
|
||||
my $node = WebGUI::Asset->getImportNode($session);
|
||||
my $root = WebGUI::Asset->getRoot( $session );
|
||||
my $top = $node->addChild({
|
||||
|
|
@ -62,7 +61,7 @@ WebGUI::Test->config->set( "exportPath" => $dir->dirname );
|
|||
# Tests
|
||||
|
||||
{
|
||||
|
||||
my $helper = WebGUI::AssetHelper::ExportHtml->new( id => 'export_html', session => $session, asset => $top );
|
||||
$output = $helper->process($top);
|
||||
cmp_deeply(
|
||||
$output,
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@ my $newPage = $home->addChild({
|
|||
|
||||
$newPage = WebGUI::Asset->newById($session, $newPage->assetId);
|
||||
|
||||
my $helper = WebGUI::AssetHelper::Lock->new( id => 'lock', session => $session );
|
||||
my $helper = WebGUI::AssetHelper::Lock->new( id => 'lock', session => $session, asset => $newPage );
|
||||
$session->user({userId => 1});
|
||||
$output = $helper->process($newPage);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -57,7 +57,7 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
$session->user({userId => 3});
|
||||
$output = $helper->process($newPage);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
@ -70,8 +70,9 @@ $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';
|
||||
|
||||
$helper = WebGUI::AssetHelper::Lock->new( id => 'lock', session => $session, asset => $newPage );
|
||||
$session->user({userId => $editor->getId});
|
||||
$output = $helper->process($newPage);
|
||||
$output = $helper->process;
|
||||
cmp_deeply(
|
||||
$output,
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue