@@ -, +, @@ --- t/db_dependent/Templates.t | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/t/db_dependent/Templates.t +++ a/t/db_dependent/Templates.t @@ -49,7 +49,7 @@ my @tables = qw( biblio biblioitems borrowers items statistics subscription ); cmp_deeply( \@keys, \@tables, 'GetColumnDefs returns the expected tables'); subtest 'Testing themelanguage for unique themes (BZ 17982)' => sub { - plan tests => 5; + plan tests => 12; my $testing_language; my $module_language = Test::MockModule->new('C4::Languages'); @@ -67,23 +67,30 @@ subtest 'Testing themelanguage for unique themes (BZ 17982)' => sub { # trigger first case. $testing_language = 'en'; my ($theme, $lang, $availablethemes) = C4::Templates::themelanguage( $htdocs, 'about.tt', $section, $cgi); + is($theme,'prog',"Expected theme: set en - $theme"); is($lang,'en','Expected language: set en'); - cmp_deeply( $availablethemes, [ 'prog' ], 'We only expect one prog here' ); + cmp_deeply( $availablethemes, [ 'prog' ], 'We only expect one prog: set en' ); # trigger second case. $testing_language = q{}; ($theme, $lang, $availablethemes) = C4::Templates::themelanguage($htdocs, 'about.tt', $section, $cgi); + is($theme,'prog',"Expected theme: default en - $theme"); is($lang,'en','Expected language: default en'); + cmp_deeply( $availablethemes, [ 'prog' ], 'We only expect one prog: default en' ); # trigger third case. my $template = $htdocs . '/prog/en/modules/about.tt'; ($theme, $lang, $availablethemes) = C4::Templates::themelanguage($htdocs, $template, $section, $cgi); + is($theme,'prog',"Expected defined theme: unset - $theme"); is($lang,q{},'Expected language: unset'); + cmp_deeply( $availablethemes, [ 'prog' ], 'We only expect one prog: unset' ); # trigger bad case. $template = $htdocs . '/prog/en/kaboom/about.tt'; ($theme, $lang, $availablethemes) = C4::Templates::themelanguage($htdocs, $template, $section, $cgi); + is($theme,'1',"Expected strange theme: not coded for - $theme"); is($lang,undef,'Expected language: not coded for'); + is( $availablethemes, undef, 'We only expect no prog: not coded for' ); return; }; --