Add tests for GroupDelete and GroupAdd macros.
Fix bugs exposed by the tests.
This commit is contained in:
parent
5a23f11707
commit
654e5751e8
5 changed files with 341 additions and 30 deletions
|
|
@ -19,6 +19,7 @@ use WebGUI::Macro_Config;
|
|||
use Data::Dumper;
|
||||
|
||||
use Test::More; # increment this value for each test you create
|
||||
use HTML::TokeParser;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
|
|
@ -27,9 +28,8 @@ unless ($session->config->get('macros')->{'GroupAdd'}) {
|
|||
}
|
||||
|
||||
my $homeAsset = WebGUI::Asset->getDefault($session);
|
||||
my ($groups, $users) = setupTest($session);
|
||||
my ($versionTag, $template, $groups, $users) = setupTest($session, $homeAsset);
|
||||
|
||||
##Add more Asset configurations here.
|
||||
my @testSets = (
|
||||
{
|
||||
comment => 'Empty macro call returns null string',
|
||||
|
|
@ -76,6 +76,57 @@ my @testSets = (
|
|||
empty => 1,
|
||||
userId => $users->[2]->userId,
|
||||
},
|
||||
{
|
||||
comment => 'Group without autoAdd returns null string',
|
||||
macroText => q!^GroupAdd("%s","%s");!,
|
||||
groupName => $groups->[1]->name,
|
||||
text => 'Join up!',
|
||||
template => '',
|
||||
empty => 1,
|
||||
userId => $users->[2]->userId,
|
||||
},
|
||||
{
|
||||
comment => 'Existing member of group sees empty string',
|
||||
macroText => q!^GroupAdd("%s","%s");!,
|
||||
groupName => $groups->[0]->name,
|
||||
text => 'Join up!',
|
||||
template => '',
|
||||
empty => 1,
|
||||
userId => $users->[0]->userId,
|
||||
},
|
||||
{
|
||||
comment => 'Non-member of group sees text and link',
|
||||
macroText => q!^GroupAdd("%s","%s");!,
|
||||
groupName => $groups->[0]->name,
|
||||
groupId => $groups->[0]->getId,
|
||||
text => 'Join up!',
|
||||
template => '',
|
||||
empty => 0,
|
||||
userId => $users->[2]->userId,
|
||||
parser => \&simpleHTMLParser,
|
||||
},
|
||||
{
|
||||
comment => 'Member of different group sees text and link',
|
||||
macroText => q!^GroupAdd("%s","%s");!,
|
||||
groupName => $groups->[0]->name,
|
||||
groupId => $groups->[0]->getId,
|
||||
text => 'Join up!',
|
||||
template => '',
|
||||
empty => 0,
|
||||
userId => $users->[1]->userId,
|
||||
parser => \&simpleHTMLParser,
|
||||
},
|
||||
{
|
||||
comment => 'Custom template check',
|
||||
macroText => q!^GroupAdd("%s","%s","%s");!,
|
||||
groupName => $groups->[0]->name,
|
||||
groupId => $groups->[0]->getId,
|
||||
text => 'Join up!',
|
||||
template => $template->get('url'),
|
||||
empty => 0,
|
||||
userId => $users->[1]->userId,
|
||||
parser => \&simpleTextParser,
|
||||
},
|
||||
);
|
||||
|
||||
my $numTests = 0;
|
||||
|
|
@ -95,11 +146,15 @@ foreach my $testSet (@testSets) {
|
|||
is($output, '', $testSet->{comment});
|
||||
}
|
||||
else {
|
||||
my ($url, $text) = $testSet->{parser}->($output);
|
||||
is($text, $testSet->{text}, 'TEXT: '.$testSet->{comment});
|
||||
my $expectedUrl = $session->url->page('op=autoAddToGroup;groupId='.$testSet->{groupId});
|
||||
is($url, $expectedUrl, 'URL: '.$testSet->{comment});
|
||||
}
|
||||
}
|
||||
|
||||
sub setupTest {
|
||||
my ($session) = @_;
|
||||
my ($session, $defaultNode) = @_;
|
||||
my @groups;
|
||||
##Two groups, one with Group Add and one without
|
||||
$groups[0] = WebGUI::Group->new($session, "new");
|
||||
|
|
@ -114,14 +169,52 @@ sub setupTest {
|
|||
$users[0]->addToGroups([$groups[0]->getId]);
|
||||
$users[1]->addToGroups([$groups[1]->getId]);
|
||||
|
||||
return \@groups, \@users;
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->set({name=>"GroupAdd test"});
|
||||
my $properties = {
|
||||
title => 'GroupAdd test template',
|
||||
className => 'WebGUI::Asset::Template',
|
||||
url => 'groupadd-test',
|
||||
namespace => 'Macro/GroupAdd',
|
||||
template => "HREF=<tmpl_var group.url>\nLABEL=<tmpl_var group.text>",
|
||||
# '1234567890123456789012'
|
||||
id => 'GroupAdd001100Template',
|
||||
};
|
||||
my $asset = $defaultNode->addChild($properties, $properties->{id});
|
||||
$versionTag->commit;
|
||||
|
||||
return $versionTag, $asset, \@groups, \@users;
|
||||
}
|
||||
|
||||
#END { ##Clean-up after yourself, always
|
||||
# foreach my $testGroup (@{ $groups }, ) {
|
||||
# $testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
|
||||
# }
|
||||
# foreach my $dude (@{ $users }, ) {
|
||||
# $dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
|
||||
# }
|
||||
#}
|
||||
sub simpleHTMLParser {
|
||||
my ($text) = @_;
|
||||
my $p = HTML::TokeParser->new(\$text);
|
||||
|
||||
my $token = $p->get_tag("a");
|
||||
my $url = $token->[1]{href} || "-";
|
||||
my $label = $p->get_trimmed_text("/a");
|
||||
|
||||
return ($url, $label);
|
||||
}
|
||||
|
||||
sub simpleTextParser {
|
||||
my ($text) = @_;
|
||||
|
||||
my ($url) = $text =~ /^HREF=(.+)$/m;
|
||||
my ($label) = $text =~ /^LABEL=(.+)$/m;
|
||||
|
||||
return ($url, $label);
|
||||
}
|
||||
|
||||
|
||||
END { ##Clean-up after yourself, always
|
||||
foreach my $testGroup (@{ $groups }, ) {
|
||||
$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
|
||||
}
|
||||
foreach my $dude (@{ $users }, ) {
|
||||
$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
|
||||
}
|
||||
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
|
||||
$versionTag->rollback;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue