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

Last batch of User and Group cleanups.

Browse source
This commit is contained in:
Colin Kuskie 2009-05-01 03:29:32 +00:00
parent 39607fc208
commit d83f1fd5fc
7 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
t/Asset/Wobject/Collaboration/permission.t
View file

@ -31,6 +31,7 @@ my $node = WebGUI::Asset->getImportNode( $session );
my %user; my %user;
$user{"2"} = WebGUI::User->new( $session, "new" ); $user{"2"} = WebGUI::User->new( $session, "new" );
$user{"2"}->addToGroups( ['2'] ); # Registered user $user{"2"}->addToGroups( ['2'] ); # Registered user
WebGUI::Test->usersToDelete($user{'2'});
my $versionTag = WebGUI::VersionTag->getWorking( $session ); my $versionTag = WebGUI::VersionTag->getWorking( $session );
$versionTag->set( { name => "Collaboration Test" } ); $versionTag->set( { name => "Collaboration Test" } );
@ -108,8 +109,5 @@ $maker->prepare( {
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Cleanup # Cleanup
END { END {
for my $user ( values %user ) {
$user->delete;
}
$versionTag->rollback; $versionTag->rollback;
} }

2
t/Asset/Wobject/Gallery/permission.t
View file

@ -29,6 +29,7 @@ my $maker = WebGUI::Test::Maker::Permission->new;
my $gallery; my $gallery;
my $nonAdmin = WebGUI::User->new( $session, "new" ); my $nonAdmin = WebGUI::User->new( $session, "new" );
WebGUI::Test->usersToDelete($nonAdmin);
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -79,5 +80,4 @@ $maker->run;
# Cleanup # Cleanup
END { END {
$versionTag->rollback; $versionTag->rollback;
$nonAdmin->delete;
} }

3
t/Asset/Wobject/GalleryAlbum/edit.t
View file

@ -35,6 +35,7 @@ $session->setting->set( 'specialState', '' );
# Create a user for testing purposes # Create a user for testing purposes
my $user = WebGUI::User->new( $session, "new" ); my $user = WebGUI::User->new( $session, "new" );
WebGUI::Test->usersToDelete($user);
$user->username( 'dufresne' . time ); $user->username( 'dufresne' . time );
my $identifier = 'ritahayworth'; my $identifier = 'ritahayworth';
my $auth = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId ); my $auth = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@ -115,8 +116,6 @@ END {
for my $tag ( @versionTags ) { for my $tag ( @versionTags ) {
$tag->rollback; $tag->rollback;
} }
$user->delete;
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

2
t/Asset/Wobject/GalleryAlbum/permission.t
View file

@ -28,6 +28,7 @@ my $node = WebGUI::Asset->getImportNode($session);
my %user; my %user;
$user{"2"} = WebGUI::User->new( $session, "new" ); $user{"2"} = WebGUI::User->new( $session, "new" );
$user{"2"}->addToGroups( ['2'] ); # Registered user $user{"2"}->addToGroups( ['2'] ); # Registered user
WebGUI::Test->usersToDelete($user{'2'});
my $versionTag = WebGUI::VersionTag->getWorking($session); my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"}); $versionTag->set({name=>"Album Test"});
@ -108,6 +109,5 @@ $maker->run;
# Cleanup # Cleanup
END { END {
$versionTag->rollback(); $versionTag->rollback();
$user{"2"}->delete;
} }

2
t/Asset/Wobject/Survey.t
View file

@ -31,6 +31,7 @@ SKIP: {
skip $tests, "Unable to load Survey" unless $usedOk; skip $tests, "Unable to load Survey" unless $usedOk;
$user = WebGUI::User->new( $session, 'new' ); $user = WebGUI::User->new( $session, 'new' );
WebGUI::Test->usersToDelete($user);
$import_node = WebGUI::Asset->getImportNode($session); $import_node = WebGUI::Asset->getImportNode($session);
# Create a Survey # Create a Survey
@ -118,7 +119,6 @@ ok($s->responseId, '..(and similarly for responseId)');
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Cleanup # Cleanup
END { END {
$user->delete() if $user;
$survey->purge() if $survey; $survey->purge() if $survey;
my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 ); my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 );

2
t/Asset/Wobject/Survey/ExpressionEngine.t
View file

@ -114,6 +114,7 @@ SKIP: {
# Create a test user # Create a test user
$user = WebGUI::User->new( $session, 'new' ); $user = WebGUI::User->new( $session, 'new' );
WebGUI::Test->usersToDelete($user);
# Create a Survey # Create a Survey
$versionTag = WebGUI::VersionTag->getWorking($session); $versionTag = WebGUI::VersionTag->getWorking($session);
@ -166,7 +167,6 @@ SKIP: {
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Cleanup # Cleanup
END { END {
$user->delete if $user;
$survey->purge if $survey; $survey->purge if $survey;
$versionTag->rollback if $versionTag; $versionTag->rollback if $versionTag;
} }

4
t/Session.t
View file

@ -24,6 +24,7 @@ plan tests => 4; # increment this value for each test you create
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
my $user = WebGUI::User->new($session, "new"); my $user = WebGUI::User->new($session, "new");
WebGUI::Test->usersToDelete($user);
$session->user({user => $user}); $session->user({user => $user});
@ -55,8 +56,5 @@ my $slave2 = $session->dbSlave;
isa_ok($slave2, 'WebGUI::SQL'); isa_ok($slave2, 'WebGUI::SQL');
END { END {
foreach my $dude ($user) {
$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
}
$session->config->delete('dbslave2'); $session->config->delete('dbslave2');
} }