TestSetup: $::request muss eine Instanz von SL::Request sein

diff --git a/t/Support/TestSetup.pm b/t/Support/TestSetup.pm
index c0b9e782d6d8c69b6c5d1224b9bc442750ac8511..671e6d9dcbb1e6da24c7b6a38e2d68307c736bfe 100644 (file)
--- a/t/Support/TestSetup.pm
+++ b/t/Support/TestSetup.pm
@@ -9,8 +9,10 @@ use SL::Form;
 use SL::Locale;
 use SL::LXDebug;
 use Data::Dumper;
 use SL::Locale;
 use SL::LXDebug;
 use Data::Dumper;

+use SL::Layout::None;

 use SL::LxOfficeConf;
 use SL::InstanceConfiguration;
 use SL::LxOfficeConf;
 use SL::InstanceConfiguration;

+use SL::Request;

 
 sub _login {
   my $login = shift;
 
 sub _login {
   my $login = shift;


@@ -25,7 +27,7 @@ sub _login {
   $::form          = Form->new;
   $::auth          = SL::Auth->new;
   $::instance_conf = SL::InstanceConfiguration->new;
   $::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;
 
 
   die 'cannot reach auth db'               unless $::auth->session_tables_present;
 

diff --git a/t/controllers/base/render.t b/t/controllers/base/render.t
index 716ba428c08655531253e1cfda977d4c9d1410cb..0f252bbe2ae779156cf9bce97c54a3cfb875011f 100644 (file)
--- a/t/controllers/base/render.t
+++ b/t/controllers/base/render.t
@@ -15,10 +15,10 @@ Support::TestSetup::login();
 sub reset_test_env {
   $ENV{HTTP_USER_AGENT} = 'Perl Tests';
 
 sub reset_test_env {
   $ENV{HTTP_USER_AGENT} = 'Perl Tests';
 

-  $::request       = {
+  $::request       = SL::Request->new(

     cgi => CGI->new({}),
     layout => SL::Layout::Javascript->new,
     cgi => CGI->new({}),
     layout => SL::Layout::Javascript->new,

-  };
+  );

 
   $::myconfig{menustyle} = 'javascript';
 
 
   $::myconfig{menustyle} = 'javascript';