tests: hide backend error from tests not using backends

sni · Jun 13, 2024 · faabeca · faabeca
1 parent c1e0231
commit faabeca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/lib/Thruk/Controller/Root.pm b/lib/Thruk/Controller/Root.pm
@@ -118,7 +118,11 @@ page: /thruk/changes.html
 sub thruk_changes_html {
     my( $c ) = @_;
     $c->stash->{'hide_backends_chooser'} = 1;
-    Thruk::Action::AddDefaults::add_defaults($c, Thruk::Constants::ADD_SAFE_DEFAULTS);
+    # use cached and safe defaults
+    eval {
+        Thruk::Action::AddDefaults::add_defaults($c, [ Thruk::Constants::ADD_CACHED_DEFAULTS, Thruk::Constants::ADD_SAFE_DEFAULTS ]);
+    };
+    _debug("adding defaults failed: ".$@) if $@;
     $c->stash->{infoBoxTitle}            = 'Change Log';
     $c->stash->{'title'}                 = 'Change Log';
     $c->stash->{'no_auto_reload'}        = 1;
@@ -141,7 +145,11 @@ page: /thruk/docs/
 sub thruk_docs  {
     my( $c ) = @_;
     $c->stash->{'hide_backends_chooser'} = 1;
-    Thruk::Action::AddDefaults::add_defaults($c, Thruk::Constants::ADD_SAFE_DEFAULTS);
+    # use cached and safe defaults
+    eval {
+        Thruk::Action::AddDefaults::add_defaults($c, [ Thruk::Constants::ADD_CACHED_DEFAULTS, Thruk::Constants::ADD_SAFE_DEFAULTS ]);
+    };
+    _debug("adding defaults failed: ".$@) if $@;
     $c->stash->{infoBoxTitle}            = 'Documentation';
     $c->stash->{'title'}                 = 'Documentation';
     $c->stash->{'no_auto_reload'}        = 1;

diff --git a/t/010-Thruk-Utils.t b/t/010-Thruk-Utils.t
@@ -246,6 +246,8 @@ ok(is_utf8($encoded), 'is_utf8 test20ac');
 
 #########################
 my $uri;
+my($res, $context) = TestUtils::ctx_request('/thruk/main.html');
+$c = $context;
 $uri = Thruk::Utils::Filter::uri_with($c, {});
 is($uri, 'main.html', 'uri_with without params');
 
@@ -255,7 +257,7 @@ is($uri, 'main.html?a=1&amp;b=2&amp;c=3', 'uri_with with 3 params');
 $uri = Thruk::Utils::Filter::uri_with($c, { a => 1, b => undef, c => 'undef'});
 is($uri, 'main.html?a=1', 'uri_with with undef params');
 
-my($res, $context) = TestUtils::ctx_request('/thruk/main.html?a=1&b=2&c=3&a=4');
+($res, $context) = TestUtils::ctx_request('/thruk/main.html?a=1&b=2&c=3&a=4');
 $c = $context;
 
 my $param_exp = {a=>[1,4], b => 2, c => 3};

diff --git a/t/TestUtils.pm b/t/TestUtils.pm
@@ -631,7 +631,7 @@ sub get_c {
     our($c);
     return $c if defined $c;
     my $res;
-    ($res, $c) = ctx_request('/thruk/main.html');
+    ($res, $c) = ctx_request('/thruk/changes.html');
     return $c;
 }