Last batch of User and Group cleanups.
This commit is contained in:
parent
39607fc208
commit
d83f1fd5fc
7 changed files with 7 additions and 12 deletions
|
|
@ -31,6 +31,7 @@ my $node = WebGUI::Asset->getImportNode( $session );
|
|||
my %user;
|
||||
$user{"2"} = WebGUI::User->new( $session, "new" );
|
||||
$user{"2"}->addToGroups( ['2'] ); # Registered user
|
||||
WebGUI::Test->usersToDelete($user{'2'});
|
||||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking( $session );
|
||||
$versionTag->set( { name => "Collaboration Test" } );
|
||||
|
|
@ -108,8 +109,5 @@ $maker->prepare( {
|
|||
#----------------------------------------------------------------------------
|
||||
# Cleanup
|
||||
END {
|
||||
for my $user ( values %user ) {
|
||||
$user->delete;
|
||||
}
|
||||
$versionTag->rollback;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ my $maker = WebGUI::Test::Maker::Permission->new;
|
|||
my $gallery;
|
||||
|
||||
my $nonAdmin = WebGUI::User->new( $session, "new" );
|
||||
WebGUI::Test->usersToDelete($nonAdmin);
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
|
@ -79,5 +80,4 @@ $maker->run;
|
|||
# Cleanup
|
||||
END {
|
||||
$versionTag->rollback;
|
||||
$nonAdmin->delete;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ $session->setting->set( 'specialState', '' );
|
|||
|
||||
# Create a user for testing purposes
|
||||
my $user = WebGUI::User->new( $session, "new" );
|
||||
WebGUI::Test->usersToDelete($user);
|
||||
$user->username( 'dufresne' . time );
|
||||
my $identifier = 'ritahayworth';
|
||||
my $auth = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
|
||||
|
|
@ -115,8 +116,6 @@ END {
|
|||
for my $tag ( @versionTags ) {
|
||||
$tag->rollback;
|
||||
}
|
||||
|
||||
$user->delete;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ my $node = WebGUI::Asset->getImportNode($session);
|
|||
my %user;
|
||||
$user{"2"} = WebGUI::User->new( $session, "new" );
|
||||
$user{"2"}->addToGroups( ['2'] ); # Registered user
|
||||
WebGUI::Test->usersToDelete($user{'2'});
|
||||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->set({name=>"Album Test"});
|
||||
|
|
@ -108,6 +109,5 @@ $maker->run;
|
|||
# Cleanup
|
||||
END {
|
||||
$versionTag->rollback();
|
||||
$user{"2"}->delete;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ SKIP: {
|
|||
|
||||
skip $tests, "Unable to load Survey" unless $usedOk;
|
||||
$user = WebGUI::User->new( $session, 'new' );
|
||||
WebGUI::Test->usersToDelete($user);
|
||||
$import_node = WebGUI::Asset->getImportNode($session);
|
||||
|
||||
# Create a Survey
|
||||
|
|
@ -118,7 +119,6 @@ ok($s->responseId, '..(and similarly for responseId)');
|
|||
#----------------------------------------------------------------------------
|
||||
# Cleanup
|
||||
END {
|
||||
$user->delete() if $user;
|
||||
$survey->purge() if $survey;
|
||||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 );
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ SKIP: {
|
|||
|
||||
# Create a test user
|
||||
$user = WebGUI::User->new( $session, 'new' );
|
||||
WebGUI::Test->usersToDelete($user);
|
||||
|
||||
# Create a Survey
|
||||
$versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
|
|
@ -166,7 +167,6 @@ SKIP: {
|
|||
#----------------------------------------------------------------------------
|
||||
# Cleanup
|
||||
END {
|
||||
$user->delete if $user;
|
||||
$survey->purge if $survey;
|
||||
$versionTag->rollback if $versionTag;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ plan tests => 4; # increment this value for each test you create
|
|||
my $session = WebGUI::Test->session;
|
||||
|
||||
my $user = WebGUI::User->new($session, "new");
|
||||
WebGUI::Test->usersToDelete($user);
|
||||
|
||||
$session->user({user => $user});
|
||||
|
||||
|
|
@ -55,8 +56,5 @@ my $slave2 = $session->dbSlave;
|
|||
isa_ok($slave2, 'WebGUI::SQL');
|
||||
|
||||
END {
|
||||
foreach my $dude ($user) {
|
||||
$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
|
||||
}
|
||||
$session->config->delete('dbslave2');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue