X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FSelfTest.pm;h=6137ced4270e8e5cd8e62d4481480a14aef24244;hb=b167020e55e1fed6e66654f5ae397a91b580a7be;hp=241a9952eae2ddcaefba2b2324797196cc95ac8f;hpb=f7d51d3e6c5e9b16f688e2e9417f54aee64ed23a;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm index 241a9952e..6137ced42 100644 --- a/SL/BackgroundJob/SelfTest.pm +++ b/SL/BackgroundJob/SelfTest.pm @@ -11,6 +11,7 @@ use Sys::Hostname; use FindBin; use SL::DB::AuthUser; +use SL::DB::Default; use SL::Common; use Rose::Object::MakeMethods::Generic ( @@ -37,6 +38,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}); @@ -122,7 +124,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,7 +146,7 @@ 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'; @@ -173,12 +175,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