Jonathan Druart
9820f9dfbd
At the moment, the sysprefs are only cache in the thread memory executing the processus When using Plack, that means we need to clear the syspref cache on each page. To avoid that, we can use Koha::Cache to cache the sysprefs correctly. A big part of the authorship of this patch goes to Robin Sheat. Test plan: 1/ Add/Update/Delete local use prefs 2/ Update pref values and confirm that the changes are correctly taken into account Signed-off-by: Chris <chrisc@catalyst.net.nz> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Tested with plack with syspref cache enabled, there is some time between setting the syspref and applying it, but it takes just one reload of page, it shouldn't be problem, should it? Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Tested with CGI and CGI + memcache; some small issues still remain, but it would be better to deal with them in separate bug reports if necessary Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
148 lines
5.5 KiB
Perl
Executable file
148 lines
5.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use Test::More;
|
|
use Test::MockModule;
|
|
use vars qw($debug $koha $dbh $config $ret);
|
|
use t::lib::Mocks;
|
|
|
|
use Koha::Database;
|
|
|
|
BEGIN {
|
|
$debug = $ENV{DEBUG} || 0;
|
|
|
|
# Note: The overall number of tests may vary by configuration.
|
|
# First we need to check your environmental variables
|
|
for (qw(KOHA_CONF PERL5LIB)) {
|
|
ok( $ret = $ENV{$_}, "ENV{$_} = $ret" );
|
|
}
|
|
use_ok('C4::Context');
|
|
}
|
|
|
|
ok($dbh = C4::Context->dbh(), 'Getting dbh from C4::Context');
|
|
|
|
$dbh->begin_work;
|
|
C4::Context->set_preference('OPACBaseURL','junk');
|
|
C4::Context->clear_syspref_cache();
|
|
my $OPACBaseURL = C4::Context->preference('OPACBaseURL');
|
|
is($OPACBaseURL,'http://junk','OPACBaseURL saved with http:// when missing it');
|
|
|
|
C4::Context->set_preference('OPACBaseURL','https://junk');
|
|
C4::Context->clear_syspref_cache();
|
|
$OPACBaseURL = C4::Context->preference('OPACBaseURL');
|
|
is($OPACBaseURL,'https://junk','OPACBaseURL saved with https:// as specified');
|
|
|
|
C4::Context->set_preference('OPACBaseURL','http://junk2');
|
|
C4::Context->clear_syspref_cache();
|
|
$OPACBaseURL = C4::Context->preference('OPACBaseURL');
|
|
is($OPACBaseURL,'http://junk2','OPACBaseURL saved with http:// as specified');
|
|
|
|
C4::Context->set_preference('SillyPreference','random');
|
|
C4::Context->clear_syspref_cache();
|
|
my $SillyPeference = C4::Context->preference('SillyPreference');
|
|
is($SillyPeference,'random','SillyPreference saved as specified');
|
|
C4::Context->clear_syspref_cache();
|
|
C4::Context->enable_syspref_cache();
|
|
$dbh->rollback;
|
|
|
|
ok($koha = C4::Context->new, 'C4::Context->new');
|
|
my @keys = keys %$koha;
|
|
my $width = 0;
|
|
if (ok(@keys)) {
|
|
$width = (sort {$a <=> $b} map {length} @keys)[-1];
|
|
$debug and diag "widest key is $width";
|
|
}
|
|
foreach (sort @keys) {
|
|
ok(exists $koha->{$_},
|
|
'$koha->{' . sprintf('%' . $width . 's', $_) . '} exists '
|
|
. ((defined $koha->{$_}) ? "and is defined." : "but is not defined.")
|
|
);
|
|
}
|
|
ok($config = $koha->{config}, 'Getting $koha->{config} ');
|
|
|
|
# Testing syspref caching
|
|
t::lib::Mocks::mock_dbh;
|
|
|
|
my $history;
|
|
|
|
my $schema = Koha::Database->new()->schema();
|
|
$schema->storage->debug(1);
|
|
my $trace_read;
|
|
open my $trace, '>', \$trace_read or die "Can't open variable: $!";
|
|
$schema->storage->debugfh( $trace );
|
|
|
|
C4::Context->set_preference('SillyPreference', 'thing1');
|
|
my $silly_preference = Koha::Config::SysPrefs->find('SillyPreference');
|
|
|
|
my $pref = C4::Context->preference("SillyPreference");
|
|
is(C4::Context->preference("SillyPreference"), 'thing1', "Retrieved syspref (value='thing1') successfully with default behavior");
|
|
ok( $trace_read, 'Retrieved syspref from database');
|
|
$trace_read = q{};
|
|
|
|
is(C4::Context->preference("SillyPreference"), 'thing1', "Retrieved syspref (value='thing1') successfully with default behavior");
|
|
is( $trace_read , q{}, 'Did not retrieve syspref from database');
|
|
$trace_read = q{};
|
|
|
|
C4::Context->disable_syspref_cache();
|
|
$silly_preference->set( { value => 'thing2' } )->store();
|
|
is(C4::Context->preference("SillyPreference"), 'thing2', "Retrieved syspref (value='thing2') successfully with disabled cache");
|
|
ok($trace_read, 'Retrieved syspref from database');
|
|
$trace_read = q{};
|
|
|
|
$silly_preference->set( { value => 'thing3' } )->store();
|
|
is(C4::Context->preference("SillyPreference"), 'thing3', "Retrieved syspref (value='thing3') successfully with disabled cache");
|
|
ok($trace_read, 'Retrieved syspref from database');
|
|
$trace_read = q{};
|
|
|
|
C4::Context->enable_syspref_cache();
|
|
is(C4::Context->preference("SillyPreference"), 'thing3', "Retrieved syspref (value='thing3') successfully from cache");
|
|
isnt( $trace_read, q{}, 'The pref should be retrieved from the database if the cache has been enabled');
|
|
$trace_read = q{};
|
|
|
|
# FIXME This was added by Robin and does not pass anymore
|
|
# I don't understand why we should expect thing1 while thing3 is in the cache and in the DB
|
|
#$dbh->{mock_clear_history} = 1;
|
|
## This gives us the value that was cached on the first call, when the cache was active.
|
|
#is(C4::Context->preference("SillyPreference"), 'thing1', "Retrieved syspref (value='thing1') successfully from cache");
|
|
#$history = $dbh->{mock_all_history};
|
|
#is(scalar(@{$history}), 0, 'Did not retrieve syspref from database');
|
|
|
|
$silly_preference->set( { value => 'thing4' } )->store();
|
|
C4::Context->clear_syspref_cache();
|
|
is(C4::Context->preference("SillyPreference"), 'thing4', "Retrieved syspref (value='thing4') successfully after clearing cache");
|
|
ok($trace_read, 'Retrieved syspref from database');
|
|
$trace_read = q{};
|
|
|
|
is(C4::Context->preference("SillyPreference"), 'thing4', "Retrieved syspref (value='thing4') successfully from cache");
|
|
is( $trace_read, q{}, 'Did not retrieve syspref from database');
|
|
$trace_read = q{};
|
|
|
|
my $oConnection = C4::Context->Zconn('biblioserver', 0);
|
|
isnt($oConnection->option('async'), 1, "ZOOM connection is synchronous");
|
|
$oConnection = C4::Context->Zconn('biblioserver', 1);
|
|
is($oConnection->option('async'), 1, "ZOOM connection is asynchronous");
|
|
|
|
$silly_preference->delete();
|
|
|
|
# AutoEmailOpacUser should be a YesNo pref
|
|
C4::Context->set_preference('AutoEmailOpacUser', '');
|
|
my $yesno_pref = Koha::Config::SysPrefs->find('AutoEmailOpacUser');
|
|
is( $yesno_pref->value(), 0, 'set_preference should have set the value to 0, instead of an empty string' );
|
|
|
|
done_testing();
|
|
|
|
sub TransformVersionToNum {
|
|
my $version = shift;
|
|
|
|
# remove the 3 last . to have a Perl number
|
|
$version =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
|
|
|
|
# three X's at the end indicate that you are testing patch with dbrev
|
|
# change it into 999
|
|
# prevents error on a < comparison between strings (should be: lt)
|
|
$version =~ s/XXX$/999/;
|
|
return $version;
|
|
}
|
|
1;
|