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

almost done fixing addRevision tests

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
t/Macro/AdminToggle.t
View file

@ -22,7 +22,7 @@ my $session = WebGUI::Test->session;
my $template = addTemplate();
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->asset($homeAsset);
my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
@ -94,9 +94,7 @@ TODO: {
sub addTemplate {
$session->user({userId=>3});
my $importNode = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"AdminToggle test"});
my $importNode = WebGUI::Test->asset;
my $properties = {
title => 'AdminToggle test template',
className => 'WebGUI::Asset::Template',
@ -107,8 +105,6 @@ sub addTemplate {
usePacked => 0,
};
my $template = $importNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $template;
}

9
t/Macro/CanEditText.t
View file

@ -19,7 +19,7 @@ my $session = WebGUI::Test->session;
use Test::More; # increment this value for each test you create
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
my ($asset, $group, @users) = setupTest($session, $homeAsset);
my @testSets = (
@ -84,8 +84,6 @@ sub setupTest {
my $cm = WebGUI::Group->find($session, "Content Managers");
$cm->addGroups([$editGroup->getId]);
##Create an asset with specific editing privileges
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"CanEditText test"});
my $properties = {
title => 'CanEditText test template',
className => 'WebGUI::Asset::Wobject::Article',
@ -94,13 +92,12 @@ sub setupTest {
id => 'CanEditTextTestAsset01',
groupIdEdit => $editGroup->getId(),
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
my $asset = WebGUI::Test->asset->addChild($properties, $properties->{id});
my @users = map { WebGUI::User->new($session, "new") } 0..2;
##User 1 is a content manager
$users[1]->addToGroups([$cm->getId]);
##User 2 is a member of a content manager sub-group
$users[2]->addToGroups([$editGroup->getId]);
addToCleanup($versionTag, $editGroup, @users);
addToCleanup($editGroup, @users);
return ($asset, $editGroup, @users);
}

13
t/Macro/EditableToggle.t
View file

@ -20,8 +20,8 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my ($versionTag, $asset, @users) = setupTest($session, $homeAsset);
my $homeAsset = WebGUI::Test->asset;
my ($asset, @users) = setupTest($session, $homeAsset);
my $i18n = WebGUI::International->new($session,'Macro_EditableToggle');
@ -247,8 +247,6 @@ sub setupTest {
my $editGroup = WebGUI::Group->new($session, "new");
my $tao = WebGUI::Group->find($session, "Turn Admin On");
##Create an asset with specific editing privileges
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"EditableToggle test"});
my $properties = {
title => 'EditableToggle test template',
className => 'WebGUI::Asset::Template',
@ -260,13 +258,12 @@ sub setupTest {
id => 'EditableToggleTemplate',
usePacked => 1,
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
my $asset = WebGUI::Test->asset->addChild($properties, $properties->{id});
my @users = map { WebGUI::User->new($session, "new") } 0..2;
##User 1 is an editor
$users[1]->addToGroups([$editGroup->getId]);
##User 2 is an editor AND can turn on Admin
$users[2]->addToGroups([$editGroup->getId, $tao->getId]);
addToCleanup($versionTag, $editGroup, @users);
return ($versionTag, $asset, @users);
addToCleanup($editGroup, @users);
return ($asset, @users);
}

6
t/Macro/FilePump.t
View file

@ -34,7 +34,7 @@ plan tests => 11;
my $bundle = WebGUI::FilePump::Bundle->new($session, { bundleName => 'test bundle'});
my $root = WebGUI::Asset->getRoot($session);
my $root = WebGUI::Test->asset;
my $snippet = $root->addChild({
className => 'WebGUI::Asset::Snippet',
@ -51,10 +51,6 @@ my $fileAsset = $root->addChild({
$fileAsset->getStorageLocation->addFileFromScalar('pumpfile.css', qq| body {\npadding: 0px;}\n\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->addToCleanup($snippetTag);
$snippetTag->commit;
ok($bundle->addFile('JS', 'asset://filePumpSnippet'), 'Added filePumpSnippet');
ok($bundle->addFile('CSS', 'asset://filePumpFileAsset'), 'Added filePumpAsset');

6
t/Macro/FileUrl.t
View file

@ -88,7 +88,7 @@ $numTests += 1; #non-existant URL
plan tests => $numTests;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
my @testSets = setupTest($session, $homeAsset, @testSets);
@ -107,8 +107,6 @@ is($output, $i18n->get('invalid url'), "Non-existant url returns error message")
sub setupTest {
my ($session, $homeAsset, @testSets) = @_;
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"FileUrl macro test"});
my $testNum = 0;
foreach my $testSet (@testSets) {
@ -133,7 +131,5 @@ sub setupTest {
$testSet->{asset} = $asset;
++$testNum;
}
$versionTag->commit;
addToCleanup($versionTag);
return @testSets;
}

6
t/Macro/GroupAdd.t
View file

@ -21,7 +21,7 @@ use JSON qw/from_json/;
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
my ($template, $groups, $users) = setupTest($session, $homeAsset);
my @testSets = (
@ -153,8 +153,6 @@ sub setupTest {
$users[1]->addToGroups([$groups[1]->getId]);
addToCleanup(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupAdd test"});
my $properties = {
title => 'GroupAdd test template',
className => 'WebGUI::Asset::Template',
@ -166,8 +164,6 @@ sub setupTest {
usePacked => 1,
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $asset, \@groups, \@users;
}

6
t/Macro/GroupDelete.t
View file

@ -20,7 +20,7 @@ use HTML::TokeParser;
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
my ($template, $groups, $users) = setupTest($session, $homeAsset);
my @testSets = (
@ -152,8 +152,6 @@ sub setupTest {
$users[1]->addToGroups([$groups[1]->getId]);
addToCleanup(@users);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"GroupDelete test"});
my $properties = {
title => 'GroupDelete test template',
className => 'WebGUI::Asset::Template',
@ -165,8 +163,6 @@ sub setupTest {
id => 'GroupDelete001Template',
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $asset, \@groups, \@users;
}

13
t/Macro/H_homeLink.t
View file

@ -19,10 +19,10 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my ($versionTag, $template) = addTemplate();
WebGUI::Test->addToCleanup($versionTag);
my ($template) = addTemplate();
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->setting->set( 'defaultPage', $homeAsset->getId );
my $i18n = WebGUI::International->new($session,'Macro_H_homeLink');
@ -89,9 +89,7 @@ foreach my $testSet (@testSets) {
sub addTemplate {
$session->user({userId=>3});
my $importNode = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"H_homeLink test"});
my $importNode = WebGUI::Test->asset;
my $properties = {
title => 'H_homeLink test template',
className => 'WebGUI::Asset::Template',
@ -102,8 +100,7 @@ sub addTemplate {
usePacked => 1,
};
my $template = $importNode->addChild($properties, $properties->{id});
$versionTag->commit;
return ($versionTag, $template);
return ($template);
}
sub simpleHTMLParser {

6
t/Macro/L_loginBox.t
View file

@ -19,7 +19,7 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->asset($homeAsset);
my $template = setupTest($session, $homeAsset);
$session->user({userId=>1});
@ -197,8 +197,6 @@ sub setupTest {
my ($session, $defaultNode) = @_;
$session->user({userId=>3});
##Create an asset with specific editing privileges
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"L_loginBox test"});
my $properties = {
title => 'L_loginBox test template',
className => 'WebGUI::Asset::Template',
@ -219,7 +217,5 @@ sub setupTest {
account.create.label form.footer form.returnUrl/;
#$properties->{template} .= "\n";
my $template = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $template;
}

10
t/Macro/LastModified.t
View file

@ -18,7 +18,7 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
my ($time) = $session->dbSlave->quickArray("SELECT max(revisionDate) FROM assetData where assetId=?",[$homeAsset->getId]);
@ -49,9 +49,6 @@ $numTests += 2; #For the use_ok, default asset, and revisionDate=0
plan tests => $numTests;
my $versionTag = WebGUI::VersionTag->getWorking($session);
addToCleanup($versionTag);
my $output = WebGUI::Macro::LastModified::process($session);
is($output, '', "Macro returns '' if no asset is defined");
@ -63,9 +60,7 @@ foreach my $testSet (@testSets) {
is($output, $testSet->{output}, $testSet->{comment});
}
$versionTag->set({name=>"Adding assets for LastModified macro tests"});
my $root = WebGUI::Asset->getRoot($session);
my $root = WebGUI::Test->asset;
my %properties_A = (
className => 'WebGUI::Asset',
title => 'Asset A',
@ -78,7 +73,6 @@ my %properties_A = (
);
my $assetA = $root->addChild(\%properties_A, $properties_A{id}, 0e0);
$versionTag->commit;
##Save the original revisionDate and then rewrite it in the db to be 0
my $revDate = $session->db->quickArray('select max(revisionDate) from assetData where assetId=?', [$assetA->getId]);

6
t/Macro/LoginToggle.t
View file

@ -20,7 +20,7 @@ use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->asset($homeAsset);
my $template = setupTest($session, $homeAsset);
@ -179,8 +179,6 @@ sub setupTest {
$session->user({userId=>3});
my $tao = WebGUI::Group->find($session, "Turn Admin On");
##Create an asset with specific editing privileges
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"LoginToggle test"});
my $properties = {
title => 'LoginToggle test template',
className => 'WebGUI::Asset::Template',
@ -193,7 +191,5 @@ sub setupTest {
id => 'LoginToggleTemplateA01',
};
my $template = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return ($template);
}

6
t/Macro/Page.t
View file

@ -49,7 +49,7 @@ $numTests += 1; #For macro call with undefined session asset
plan tests => $numTests;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
@testSets = setupTest($session, $homeAsset, @testSets);
@ -72,14 +72,10 @@ foreach my $testSet (@testSets) {
sub setupTest {
my ($session, $homeAsset, @testSets) = @_;
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Page macro test"});
foreach my $testSet (@testSets) {
my %properties = %{ $testSet };
my $asset = $homeAsset->addChild(\%properties, $properties{assetId});
$testSet->{asset} = $asset;
}
$versionTag->commit;
addToCleanup($versionTag);
return @testSets;
}

8
t/Macro/PageTitle.t
View file

@ -24,10 +24,7 @@ my $numTests = 7;
plan tests => $numTests;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"PageTitle macro test"});
my $homeAsset = WebGUI::Test->asset;
# Create a new snippet and set it's title then check it against the macros output
my $snippetTitle = "Roy's Incredible Snippet of Mystery and Intrique";
@ -39,9 +36,6 @@ my $snippet = $homeAsset->addChild({
groupIdEdit=>3,
});
$versionTag->commit;
addToCleanup($versionTag);
is(
WebGUI::Macro::PageTitle::process($session),
undef,

2
t/Macro/RootTitle.t
View file

@ -30,6 +30,7 @@ my $session = WebGUI::Test->session;
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Adding assets for RootTitle tests"});
my %tag = ( tagId => $versionTag->getId, status => "pending" );
addToCleanup($versionTag);
my $root = WebGUI::Asset->getRoot($session);
@ -41,6 +42,7 @@ my %properties_A = (
ownerUserId => 3,
groupIdView => 7,
groupIdEdit => 3,
%tag,
id => 'RootA-----------------',
# '1234567890123456789012'
);

7
t/Macro/Thumbnail.t
View file

@ -46,8 +46,6 @@ cmp_bag($storage->getFiles, ['square.png'], 'Only 1 file in storage with correct
##Initialize an Image Asset with that filename and storage location
$session->user({userId=>3});
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Thumbnail macro test"});
my $properties = {
# '1234567890123456789012'
id => 'ThumbnailAsset00000001',
@ -55,7 +53,7 @@ my $properties = {
className => 'WebGUI::Asset::File::Image',
url => 'thumbnail-test',
};
my $defaultAsset = WebGUI::Asset->getDefault($session);
my $defaultAsset = WebGUI::Test->asset;
$session->asset($defaultAsset);
my $asset = $defaultAsset->addChild($properties, $properties->{id});
$asset->update({
@ -65,9 +63,6 @@ $asset->update({
$asset->generateThumbnail();
$versionTag->commit;
addToCleanup($versionTag);
##Call the Thumbnail Macro with that Asset's URL and see if it returns
##the correct URL.

8
t/Macro/a_account.t
View file

@ -23,7 +23,7 @@ my $session = WebGUI::Test->session;
# <a class="myAccountLink" href="<tmpl_var account.url>"><tmpl_var account.text></a>
my $template = addTemplate();
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->asset($homeAsset);
@ -82,9 +82,7 @@ foreach my $testSet (@testSets) {
sub addTemplate {
$session->user({userId=>3});
my $importNode = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"a_account test"});
my $importNode = WebGUI::Test->asset;
my $properties = {
title => 'a_account test template',
className => 'WebGUI::Asset::Template',
@ -95,8 +93,6 @@ sub addTemplate {
usePacked => 1,
};
my $template = $importNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $template;
}

6
t/Macro/r_printable.t
View file

@ -21,7 +21,7 @@ use HTML::TokeParser;
my $session = WebGUI::Test->session;
my $homeAsset = WebGUI::Asset->getDefault($session);
my $homeAsset = WebGUI::Test->asset;
$session->asset($homeAsset);
my $template = setupTest($session, $homeAsset);
@ -109,8 +109,6 @@ foreach my $testSet (@testSets) {
sub setupTest {
my ($session, $defaultNode) = @_;
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"r_printable test"});
my $properties = {
title => 'printable test template',
className => 'WebGUI::Asset::Template',
@ -122,8 +120,6 @@ sub setupTest {
usePacked => 1,
};
my $asset = $defaultNode->addChild($properties, $properties->{id});
$versionTag->commit;
addToCleanup($versionTag);
return $asset;
}