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

Change tests to use the automatic backup of Settings in END blocks.

Browse source
This commit is contained in:
Colin Kuskie 2009-03-30 20:41:02 +00:00
parent 6f3aae261b
commit 4e78593395
23 changed files with 13 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
t/Asset/Asset.t
View file

@ -810,10 +810,6 @@ END {
if defined $origExtras;
$session->config->set( 'uploadsURL', $origUploads)
if defined $origUploads;
$session->setting->set('urlExtension', $origUrlExtension)
if defined $origUrlExtension;
$session->setting->set('notFoundPage', $origNotFoundPage)
if defined $origNotFoundPage;
if (defined $originalAssetOverrides) {
$session->config->set('assets', $originalAssetOverrides);
}

2
t/Asset/AssetMetaData.t
View file

@ -195,7 +195,6 @@ cmp_deeply(
#
####################################################
my $origMetaEnabled = $session->setting->get("metaDataEnabled");
$session->setting->set("metaDataEnabled", 1);
# add another field for comparison
@ -236,6 +235,5 @@ END {
$tag->rollback;
}
}
$session->setting->set("metaDataEnabled", $origMetaEnabled);
}

7
t/Asset/Event/edit.t
View file

@ -30,11 +30,8 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
$oldSettings{ defaultVersionTagWorkflow } = $session->setting->get( 'defaultVersionTagWorkflow' );
$session->setting->set( 'defaultVersionTagWorkflow', 'pbworkflow000000000003' );
# Create a user for testing purposes
@ -173,10 +170,6 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

6
t/Asset/File/GalleryFile/Photo/edit.t
View file

@ -27,12 +27,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -141,9 +138,6 @@ END {
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

7
t/Asset/Redirect/mech.t
View file

@ -29,12 +29,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -180,8 +177,4 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}

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

@ -28,12 +28,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -120,10 +117,6 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

6
t/Asset/Wobject/GalleryAlbum/rss.t
View file

@ -65,12 +65,9 @@ for my $i ( 0 .. 5 ) {
$versionTag->commit;
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
my ( $mech );
@ -122,7 +119,4 @@ cmp_deeply(
# Cleanup
END {
$versionTag->rollback();
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}