X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/f7d51d3e6c5e9b16f688e2e9417f54aee64ed23a..e8889e47af38072dc6fcbb4d97e2fdcc30d948d7:/SL/BackgroundJob/SelfTest.pm

diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm
index 241a9952e..2f8883339 100644
--- a/SL/BackgroundJob/SelfTest.pm
+++ b/SL/BackgroundJob/SelfTest.pm
@@ -11,7 +11,10 @@ use Sys::Hostname;
 use FindBin;
 
 use SL::DB::AuthUser;
+use SL::DB::Default;
 use SL::Common;
+use SL::Locale::String qw(t8);
+use Carp;
 
 use Rose::Object::MakeMethods::Generic (
   array => [
@@ -37,6 +40,7 @@ sub setup {
   $self->config($::lx_office_conf{self_test} || {});
 
   $self->tester(Test::Builder->new);
+  $self->tester->reset; # stupid Test::Builder mplementation uses class variables
   $self->aggreg(TAP::Parser::Aggregator->new);
 
   $self->modules(split /\s+/, $self->config->{modules});
@@ -64,6 +68,7 @@ sub run {
     $self->_send_email;
   }
 
+  croak t8("Unsuccessfully executed:" . join ("\n", $self->errors)) if $self->errors;
   return 1;
 }
 
@@ -122,7 +127,7 @@ sub _send_email {
 
   my ($output, $content_type) = $self->_prepare_report;
 
-  my $mail              = Mailer->new(charset => $::locale->is_utf8 ? 'UTF-8' : Common->DEFAULT_CHARSET );
+  my $mail              = Mailer->new;
   $mail->{from}         = $self->config->{email_from};
   $mail->{to}           = $email;
   $mail->{subject}      = $self->config->{email_subject};
@@ -144,15 +149,17 @@ sub _prepare_report {
 
   return unless $template;
   my $email_template = $self->config->{email_template};
-  my $filename       = $email_template || ( ($user->get_config_value('templates') || "templates/mails") . "/self_test/status_mail.txt" );
+  my $filename       = $email_template || ( (SL::DB::Default->get->templates || "templates/mails") . "/self_test/status_mail.txt" );
   my $content_type   = $filename =~ m/.html$/ ? 'text/html' : 'text/plain';
 
 
   my %params = (
     SELF     => $self,
     host     => hostname,
-    database => $::myconfig{dbname},
+    database => $::auth->client->{dbname},
+    client   => $::auth->client->{name},
     path     => $FindBin::Bin,
+    errors   => $self->errors,
   );
 
   my $output;
@@ -173,12 +180,12 @@ __END__
 
 =head1 NAME
 
-SL::BackgroundJob::TelfTests - pluggable self testing
+SL::BackgroundJob::SelfTest - pluggable self testing
 
 =head1 SYNOPSIS
 
-  use SL::BackgroundJob::SelfTests;
-  SL::BackgroundJob::SelfTests->new->run;;
+  use SL::BackgroundJob::SelfTest;
+  SL::BackgroundJob::SelfTest->new->run;;
 
 =head1 DESCRIPTION