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

protect against premature test failure corrupting config, remove debug code

Browse source
This commit is contained in:
Graham Knop 2008-09-30 17:07:26 +00:00
parent dda9a68353
commit 336cb209fd
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
t/Asset/Asset.t
View file

@ -811,10 +811,14 @@ is($iufpAsset3->getUrl, '/inheriturlfromparent01/inheriturlfromparent02/inheritu
END {
$session->config->set( 'extrasURL', $origExtras);
$session->config->set( 'uploadsURL', $origUploads);
$session->setting->set('urlExtension', $origUrlExtension);
$session->setting->set('notFoundPage', $origNotFoundPage);
$session->config->set( 'extrasURL', $origExtras)
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 $origAssetAddPrivileges) {
$session->config->set('assetAddPrivilege', $origAssetAddPrivileges);
}

1
t/lib/WebGUI/Test.pm
View file

@ -84,7 +84,6 @@ BEGIN {
unless ( File::Spec->file_name_is_absolute($WEBGUI_ROOT) ) {
$WEBGUI_ROOT = File::Spec->rel2abs($WEBGUI_ROOT);
}
warn $WEBGUI_ROOT."\n";
$CONFIG_FILE = ( File::Spec->splitpath( $WEBGUI_ROOT ) )[2];
$WEBGUI_ROOT = substr( $WEBGUI_ROOT, 0, index( $WEBGUI_ROOT, File::Spec->catdir( 'etc', $CONFIG_FILE ) ) );