oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert all test cleanup to addToCleanup

Browse source
This commit is contained in:
Graham Knop 2010-06-09 17:37:10 -05:00
parent 421b9652cf
commit 4c18ba3563
82 changed files with 190 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

4
t/Macro/FilePump.t
View file

@ -54,14 +54,14 @@ $fileAsset->getStorageLocation->addFileFromScalar('pumpfile.css', qq| body {\n
is($fileAsset->getStorageLocation->getFileContentsAsScalar($fileAsset->get('filename')), qq| body {\npadding: 0px;}\n\n|, 'Sanity check - got back expected file contents');
my $snippetTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->tagsToRollback($snippetTag);
WebGUI::Test->addToCleanup($snippetTag);
$snippetTag->commit;
ok($bundle->addFile('JS', 'asset://filePumpSnippet'), 'Added filePumpSnippet');
ok($bundle->addFile('CSS', 'asset://filePumpFileAsset'), 'Added filePumpAsset');
my $storedFile = WebGUI::Storage->create($session);
WebGUI::Test->storagesToDelete($storedFile);
WebGUI::Test->addToCleanup($storedFile);
$storedFile->addFileFromScalar('storedJS.js', qq|function helloWorld() { alert("Hellow world");}|, );
# Turn into file:uploads/path/to/fileAsset (bc file uris must begin with either file:uploads/ or file:extras/)
my $path = Path::Class::File->new($storedFile->getPath($storedFile->get('filename')));

2
t/Macro/FileUrl.t
View file

@ -115,7 +115,7 @@ sub setupTest {
foreach my $testSet (@testSets) {
my $storage = WebGUI::Storage->create($session);
WebGUI::Test->storagesToDelete($storage);
WebGUI::Test->addToCleanup($storage);
my $filename = join '.', 'fileName', $testNum;
$testSet->{filename} = $filename;

2
t/Macro/Include.t
View file

@ -30,7 +30,7 @@ my $spectreConf = WebGUI::Paths->spectreConfig;
my $goodFile = 'The contents of this file are accessible';
my $twoLines = "This file contains two lines of text\nThis is the second line";
my $storage = WebGUI::Storage->createTemp($session);
WebGUI::Test->storagesToDelete($storage);
WebGUI::Test->addToCleanup($storage);
$storage->addFileFromScalar('goodFile', $goodFile);
$storage->addFileFromScalar('twoLines', $twoLines);
$storage->addFileFromScalar('unreadableFile', 'The contents of this file are not readable');

2
t/Macro/Thumbnail.t
View file

@ -35,7 +35,7 @@ $square->setBackgroundColor('#0000FF');
##Create a storage location
my $storage = WebGUI::Storage->create($session);
WebGUI::Test->storagesToDelete($storage);
WebGUI::Test->addToCleanup($storage);
##Save the image to the location
$square->saveToStorageLocation($storage, 'square.png');

2
t/Macro/User.t
View file

@ -51,7 +51,7 @@ plan tests => $numTests;
@testSets = setupTest($session, @testSets);
my @users = map { $_->{user} } @testSets;
WebGUI::Test->usersToDelete(@users);
WebGUI::Test->addToCleanup(@users);
foreach my $testSet (@testSets) {
$session->user({ userId => $testSet->{user}->userId });