Removing END blocks
This commit is contained in:
parent
bbe962a185
commit
3b7d582e8d
3 changed files with 3 additions and 16 deletions
|
|
@ -45,9 +45,4 @@ $e = Exception::Class->caught;
|
||||||
isa_ok($e, 'WebGUI::Error');
|
isa_ok($e, 'WebGUI::Error');
|
||||||
isa_ok($e, 'WebGUI::Error::Shop::RemoteShippingRate');
|
isa_ok($e, 'WebGUI::Error::Shop::RemoteShippingRate');
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
# Cleanup
|
|
||||||
END {
|
|
||||||
|
|
||||||
}
|
|
||||||
#vim:ft=perl
|
#vim:ft=perl
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,8 @@ if ( $@ ) { diag( "Can't prepare mail server: $@" ) }
|
||||||
|
|
||||||
plan tests => 17; # Increment this number for each test you create
|
plan tests => 17; # Increment this number for each test you create
|
||||||
|
|
||||||
|
WebGUI::Test->addToCleanup(SQL => 'delete from mailQueue');
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# Test create
|
# Test create
|
||||||
$mail = WebGUI::Mail::Send->create( $session );
|
$mail = WebGUI::Mail::Send->create( $session );
|
||||||
|
|
@ -353,9 +355,3 @@ cmp_bag(
|
||||||
);
|
);
|
||||||
|
|
||||||
# TODO: Test the emailToLog config setting
|
# TODO: Test the emailToLog config setting
|
||||||
#----------------------------------------------------------------------------
|
|
||||||
# Cleanup
|
|
||||||
END {
|
|
||||||
$session->db->write('delete from mailQueue');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ my $session = WebGUI::Test->session;
|
||||||
my $lib = WebGUI::Test->lib;
|
my $lib = WebGUI::Test->lib;
|
||||||
|
|
||||||
## Remove all macros but International, and set them to call WebGUI::Macro::Callback
|
## Remove all macros but International, and set them to call WebGUI::Macro::Callback
|
||||||
|
WebGUI::Test->originalConfig('macros');
|
||||||
my $originalMacros = $session->config->get('macros');
|
my $originalMacros = $session->config->get('macros');
|
||||||
my $configFileMacros = {};
|
my $configFileMacros = {};
|
||||||
for my $macro (keys %$originalMacros) {
|
for my $macro (keys %$originalMacros) {
|
||||||
|
|
@ -85,8 +86,3 @@ foreach my $label ( @questionableTemplates ) {
|
||||||
sprintf "Empty template: %s, id: %s, url: %s", @{ $label }{qw/title id url/}
|
sprintf "Empty template: %s, id: %s, url: %s", @{ $label }{qw/title id url/}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
END {
|
|
||||||
defined $session &&
|
|
||||||
$session->config->set('macros', $originalMacros);
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue