X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2FSupport%2FTestSetup.pm;h=671e6d9dcbb1e6da24c7b6a38e2d68307c736bfe;hb=99d05c2cc969eb4913cac08ae4331c4e6a82726a;hp=c23b4fd7fb2311caa759b18d40989255d80a5846;hpb=45970e731c7e0c8a3d469a1c344af20c18987c20;p=kivitendo-erp.git diff --git a/t/Support/TestSetup.pm b/t/Support/TestSetup.pm index c23b4fd7f..671e6d9dc 100644 --- a/t/Support/TestSetup.pm +++ b/t/Support/TestSetup.pm @@ -9,9 +9,10 @@ use SL::Form; use SL::Locale; use SL::LXDebug; use Data::Dumper; +use SL::Layout::None; use SL::LxOfficeConf; use SL::InstanceConfiguration; -SL::LxOfficeConf->read; +use SL::Request; sub _login { my $login = shift; @@ -20,12 +21,13 @@ sub _login { package main; - $::lxdebug = LXDebug->new(file => \*STDERR); + $::lxdebug = LXDebug->new(target => LXDebug::STDERR_TARGET); + $::lxdebug->disable_sub_tracing; $::locale = Locale->new($::lx_office_conf{system}->{language}); $::form = Form->new; $::auth = SL::Auth->new; $::instance_conf = SL::InstanceConfiguration->new; - $::request = { cgi => CGI->new({}) }; + $::request = SL::Request->new( cgi => CGI->new({}), layout => SL::Layout::None->new ); die 'cannot reach auth db' unless $::auth->session_tables_present; @@ -33,7 +35,7 @@ sub _login { require "bin/mozilla/common.pl"; - die "cannot find user $login" unless %::myconfig = $::auth->read_user($login); + die "cannot find user $login" unless %::myconfig = $::auth->read_user(login => $login); $::form->{login} = $login; # normaly implicit at login @@ -45,6 +47,8 @@ sub _login { } sub login { + SL::LxOfficeConf->read; + my $login = shift || $::lx_office_conf{testing}{login} || 'demo'; _login($login); }