Forward porting tests with better cleanups.
This commit is contained in:
parent
a054c9de73
commit
689e645e51
3 changed files with 5 additions and 6 deletions
|
|
@ -40,6 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
|
|||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->set({name=>"Article Test"});
|
||||
WebGUI::Test->tagsToRollback($versionTag);
|
||||
my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
|
||||
|
||||
# Test for a sane object type
|
||||
|
|
@ -138,6 +139,5 @@ TODO: {
|
|||
|
||||
END {
|
||||
# Clean up after thy self
|
||||
$versionTag->rollback();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ my $node = WebGUI::Asset->getImportNode($session);
|
|||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->set({name=>"Article Test"});
|
||||
WebGUI::Test->tagsToRollback($versionTag);
|
||||
my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
|
||||
|
||||
# Test for a sane object type
|
||||
|
|
@ -99,6 +100,7 @@ $duplicateArticle->purge();
|
|||
|
||||
# The get method will create the directory if it doesnt exist... very strange.
|
||||
$duplicateStorage = WebGUI::Storage->get($session,$duplicateStorageId);
|
||||
WebGUI::Test->storagesToDelete($duplicateStorage);
|
||||
|
||||
# so lets check for the file instead
|
||||
$duplicateFilename = $duplicateStorage->getFiles->[0];
|
||||
|
|
|
|||
|
|
@ -93,15 +93,13 @@ plan tests => $numTests;
|
|||
my $macro = 'WebGUI::Macro::FileUrl';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
my $versionTag;
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $numTests-1 unless $loaded;
|
||||
|
||||
my $homeAsset = WebGUI::Asset->getDefault($session);
|
||||
|
||||
($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
|
||||
my ($versionTag, @testSets) = setupTest($session, $homeAsset, @testSets);
|
||||
|
||||
foreach my $testSet (@testSets) {
|
||||
my $output = WebGUI::Macro::FileUrl::process($session, $testSet->{url});
|
||||
|
|
@ -147,10 +145,9 @@ sub setupTest {
|
|||
++$testNum;
|
||||
}
|
||||
$versionTag->commit;
|
||||
WebGUI::Test->tagsToRollback($versionTag);
|
||||
return $versionTag, @testSets;
|
||||
}
|
||||
|
||||
END { ##Clean-up after yourself, always
|
||||
use Data::Dumper;
|
||||
$versionTag->rollback;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue