Bugzilla – Attachment 60352 Details for
Bug 18036
Improve test coverage for themelanguage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18036: All 4 cases tested
Bug-18036-All-4-cases-tested.patch (text/plain), 3.26 KB, created by
Jonathan Druart
on 2017-02-16 14:12:30 UTC
(
hide
)
Description:
Bug 18036: All 4 cases tested
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-02-16 14:12:30 UTC
Size:
3.26 KB
patch
obsolete
>From 9b3001fb11d27f7acf95c3e510907bba27c13676 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Thu, 2 Feb 2017 12:04:37 -0500 >Subject: [PATCH] Bug 18036: All 4 cases tested > >Added theme, lang, and availablethemes tests for all 4 cases. >Previously just availablethemes was tested. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >The warns from Mark's additional patch showed all four cases. > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > t/db_dependent/Templates.t | 48 ++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 42 insertions(+), 6 deletions(-) > >diff --git a/t/db_dependent/Templates.t b/t/db_dependent/Templates.t >index 24bfd5d..fcfea8c 100755 >--- a/t/db_dependent/Templates.t >+++ b/t/db_dependent/Templates.t >@@ -49,14 +49,50 @@ 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 => 1; >- >- t::lib::Mocks::mock_preference('template', 'prog'); >+ plan tests => 12; >+ my $testing_language; > my $module_language = Test::MockModule->new('C4::Languages'); >- $module_language->mock( 'getlanguage', sub { return 'en'; } ); > >- # This only triggers the first uniq but that is sufficient for now >- cmp_deeply( ( C4::Templates::themelanguage( C4::Context->config('intrahtdocs'), 'about.tt' , 'intranet', 'fake_cgi' ) )[2], [ 'prog' ], 'We only expect one prog here' ); >+ $module_language->mock( >+ 'getlanguage', >+ sub { >+ return $testing_language; >+ } >+ ); >+ >+ my $cgi = CGI->new(); >+ my $htdocs = C4::Context->config('intrahtdocs'); >+ my $section = 'intranet'; >+ >+ # 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: 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($lang,undef,'Expected language: not coded for'); >+ is( $availablethemes, undef, 'We only expect no prog: not coded for' ); >+ is($theme,undef,"Expected no theme: not coded for"); >+ >+ return; > }; > > 1; >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18036
:
59767
|
59818
|
59819
|
59820
|
59821
|
59822
|
59823
|
59824
|
59825
|
59838
|
59839
|
59843
|
59844
|
59845
|
60351
| 60352 |
60353