almost done fixing addRevision tests

This commit is contained in:
Doug Bell 2010-11-19 19:26:39 -06:00
parent 6931fd471e
commit 7c14d1e6c4
122 changed files with 389 additions and 1052 deletions

View file

@ -64,8 +64,7 @@ my $session = WebGUI::Test->session;
my $privilege = $session->privilege;
my ($versionTag, $userTemplate) = setup_assets($session);
WebGUI::Test->addToCleanup($versionTag);
my ($userTemplate) = setup_assets($session);
isa_ok($privilege, 'WebGUI::Session::Privilege', 'session has correct object type');
@ -117,9 +116,7 @@ is($output, WebGUI::Operation::Auth::www_auth($session, "init"), 'noAccess: visi
sub setup_assets {
my $session = shift;
my $importNode = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Session Style test"});
my $importNode = WebGUI::Test->asset;
my $properties = {
title => 'user template for printing',
className => 'WebGUI::Asset::Template',
@ -131,7 +128,7 @@ sub setup_assets {
# '1234567890123456789012'
};
my $userTemplate = $importNode->addChild($properties, $properties->{id});
return ($versionTag, $userTemplate);
return ($userTemplate);
}
#vim:ft=perl

View file

@ -175,8 +175,7 @@ is($macroOutput, 1, 'generateAdditionalHeadTags: process a macro');
#
####################################################
my ($versionTag, $templates, $article, $snippet) = setup_assets($session);
WebGUI::Test->addToCleanup($versionTag);
my ($templates, $article, $snippet) = setup_assets($session);
$style->sent(0);
is($style->sent, 0, 'process: setup sent to 0');
@ -463,9 +462,7 @@ sub sendImmediate {
#like($buffer, qr/$output/, );
sub setup_assets {
my $session = shift;
my $importNode = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Session Style test"});
my $importNode = WebGUI::Test->asset;
my $templates = {};
my $properties = {
title => 'personal style test template',
@ -541,7 +538,7 @@ sub setup_assets {
# '1234567890123456789012'
snippet => 'I am a snippet',
};
my $daddySnippet = WebGUI::Asset->getRoot($session)->addChild($properties, $properties->{id});
my $daddySnippet = WebGUI::Test->asset->addChild($properties, $properties->{id});
$properties = {
title => 'My Snippet',
className => 'WebGUI::Asset::Snippet',
@ -551,7 +548,5 @@ sub setup_assets {
snippet => 'I am a snippet',
};
my $snippet = $daddySnippet->addChild($properties, $properties->{id});
$versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
return ($versionTag, $templates, $asset, $snippet);
return ($templates, $asset, $snippet);
}

View file

@ -398,16 +398,14 @@ TODO: {
ok(0, 'test a child of the media folder');
}
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
my $statefulAsset = WebGUI::Asset->getRoot($session)->addChild({ className => 'WebGUI::Asset::Snippet' });
$versionTag->commit;
my $parentAsset = WebGUI::Test->asset;
my $statefulAsset = $parentAsset->addChild({ className => 'WebGUI::Asset::Snippet' });
$session->asset( $statefulAsset );
$statefulAsset->state('published');
is(
$session->url->getBackToSiteURL,
WebGUI::Asset->getRoot($session)->getUrl,
$parentAsset->getUrl,
q!getBackToSiteURL: When asset state is published, it returns you to the Assets container!
);