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

Make User.t use the new automatic config file restorer.

Browse source 
Clean up some END block code.
This commit is contained in:
Colin Kuskie 2009-03-28 03:57:30 +00:00
parent b61ef2c91f
commit 1e268ee238
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
t/User.t
View file

@ -314,6 +314,7 @@ $dude->deleteFromGroups([12]);
my $origEnvHash = $session->env->{_env}; my $origEnvHash = $session->env->{_env};
my %newEnv = ( REMOTE_ADDR => '194.168.0.2' ); my %newEnv = ( REMOTE_ADDR => '194.168.0.2' );
$session->env->{_env} = \%newEnv; $session->env->{_env} = \%newEnv;
WebGUI::Test->originalConfig('adminModeSubnets');
$session->config->set('adminModeSubnets', ['194.168.0.0/24']); $session->config->set('adminModeSubnets', ['194.168.0.0/24']);
ok(!$dude->isInGroup(12), 'user is not in group 12'); ok(!$dude->isInGroup(12), 'user is not in group 12');
@ -650,10 +651,7 @@ END {
} }
} }
(defined $expiredGroup and ref $expiredGroup eq 'WebGUI::Group') and $expiredGroup->delete;
##Note, do not delete the visitor account. That would be really bad ##Note, do not delete the visitor account. That would be really bad
$session->config->delete('adminModeSubnets');
$profileField->set(\%originalFieldData); $profileField->set(\%originalFieldData);
$aliasProfile->set(\%originalAliasProfile); $aliasProfile->set(\%originalAliasProfile);
@ -661,7 +659,7 @@ END {
$evalProfileField->delete; $evalProfileField->delete;
$visitor->profileField('email', $originalVisitorEmail); $visitor->profileField('email', $originalVisitorEmail);
$newProfileField->delete(); $newProfileField->delete() if $newProfileField;
$testCache->flush; $testCache->flush;
my $newNumberOfUsers = $session->db->quickScalar('select count(*) from users'); my $newNumberOfUsers = $session->db->quickScalar('select count(*) from users');