Bug 28220: Deal with merge

[srvgit] / t / Languages.t

diff --git a/t/Languages.t b/t/Languages.t
old mode 100644 (file)
new mode 100755 (executable)
index 8fee200..6492ba4
--- a/t/Languages.t
+++ b/t/Languages.t
@@ -21,6 +21,7 @@ use Modern::Perl;
 use Test::More tests => 4;
 use Test::MockModule;
 use CGI qw ( -utf8 );
+use Koha::Cache::Memory::Lite;
 
 BEGIN {
     use_ok('C4::Languages');
@@ -30,14 +31,14 @@ my @languages = (); # stores the list of active languages
                     # for the syspref mock
 my $return_undef = 0;
 
-my $module_context = new Test::MockModule('C4::Context');
+my $module_context = Test::MockModule->new('C4::Context');
 
 $module_context->mock(
     preference => sub {
         my ($self, $pref) = @_;
         if ($return_undef) {
-            return undef;
-        } elsif ($pref =~ /language/) {
+            return;
+        } elsif ($pref eq 'language' || $pref eq 'OPACLanguages') {
             return join ',', @languages;
         } else {
             return 'XXX';
@@ -51,8 +52,10 @@ my $query = CGI->new();
 @languages = ('de-DE', 'fr-FR');
 is(C4::Languages::getlanguage($query), 'de-DE', 'default to first language specified in syspref (bug 10560)');
 
+Koha::Cache::Memory::Lite->get_instance()->clear_from_cache('getlanguage');
 @languages = ();
 is(C4::Languages::getlanguage($query), 'en', 'default to English if no language specified in syspref (bug 10560)');
 
+Koha::Cache::Memory::Lite->get_instance()->clear_from_cache('getlanguage');
 $return_undef = 1;
 is(C4::Languages::getlanguage($query), 'en', 'default to English if no database');