@@ -, +, @@ - Reorder the backends in the AutoILLBackendPriority syspref and save, notice they're shown and suggested accordingly after creating a request. - Disable all backends from AutoILLBackendPriority. Notice the original behaviour of requiring the user to select a backend before creating the request is restored on both opac and staff. --- t/db_dependent/Illrequest/ConfirmAuto.t | 104 ++++++++++++++++++++++++ t/db_dependent/Koha/ILL/Backends.t | 84 +++++++++++++++++++ t/lib/plugins/Koha/Plugin/Test.pm | 5 ++ 3 files changed, 193 insertions(+) create mode 100755 t/db_dependent/Illrequest/ConfirmAuto.t create mode 100755 t/db_dependent/Koha/ILL/Backends.t --- a/t/db_dependent/Illrequest/ConfirmAuto.t +++ a/t/db_dependent/Illrequest/ConfirmAuto.t @@ -0,0 +1,104 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use Test::More tests => 5; + +use Test::MockModule; +use Test::MockObject; + +use t::lib::TestBuilder; +use t::lib::Mocks; + +use Koha::ILL::Request::Workflow::ConfirmAuto; +use Koha::Database; + +my $schema = Koha::Database->new->schema; +$schema->storage->txn_begin; + +my $builder = t::lib::TestBuilder->new; + +use_ok('Koha::ILL::Request::Workflow::ConfirmAuto'); + +my $metadata = { + title => 'This is a title', + author => 'This is an author' +}; + +# Because hashes can reorder themselves, we need to make sure ours is in a +# predictable order +my $sorted = {}; +foreach my $key ( keys %{$metadata} ) { + $sorted->{$key} = $metadata->{$key}; +} + +my $confirm_auto = + Koha::ILL::Request::Workflow::ConfirmAuto->new( $sorted, 'staff' ); + +isa_ok( $confirm_auto, 'Koha::ILL::Request::Workflow::ConfirmAuto' ); + +is( + $confirm_auto->prep_metadata($sorted), +'eyJhdXRob3IiOiJUaGlzIGlzIGFuIGF1dGhvciIsInRpdGxlIjoiVGhpcyBpcyBhIHRpdGxlIn0%3D%0A', + 'prep_metadata works' +); + +# Mock ILLBackend (as object) +my $backend = Test::MockObject->new; +$backend->set_isa('Koha::Illbackends::Mock'); +$backend->set_always( 'name', 'Mock' ); +$backend->set_always( 'capabilities', sub { return can_create_request => 1 } ); +$backend->mock( + 'metadata', + sub { + my ( $self, $rq ) = @_; + return { + ID => $rq->illrequest_id, + Title => $rq->patron->borrowernumber + }; + } +); +$backend->mock( 'status_graph', sub { }, ); + +# Mock Koha::ILL::Request::load_backend (to load Mocked Backend) +my $illreqmodule = Test::MockModule->new('Koha::ILL::Request'); +$illreqmodule->mock( 'load_backend', + sub { my $self = shift; $self->{_my_backend} = $backend; return $self } ); + +# Mock AutoILLBackendPriority enabled +t::lib::Mocks::mock_preference( 'AutoILLBackendPriority', 'PluginBackend' ); + +my $req_1 = $builder->build_object( + { + class => 'Koha::ILL::Requests', + value => {} + } +); + +my $request = $req_1->load_backend('Mock'); + +is( $confirm_auto->show_confirm_auto($request), + 1, 'able to show confirm auto screen' ); + +# Mock AutoILLBackendPriority disabled +t::lib::Mocks::mock_preference( 'AutoILLBackendPriority', '' ); + +is( $confirm_auto->show_confirm_auto($request), + '', 'not able to show confirm auto screen' ); + +$schema->storage->txn_rollback; --- a/t/db_dependent/Koha/ILL/Backends.t +++ a/t/db_dependent/Koha/ILL/Backends.t @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# Copyright 2023 Koha Development team +# +# This file is part of Koha +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; +use File::Basename; +use File::Path qw(make_path remove_tree); +use Test::MockModule; + +use Test::More tests => 4; + +use Koha::ILL::Backends; + +use t::lib::TestBuilder; +use t::lib::Mocks; + +BEGIN { + # Mock pluginsdir before loading Plugins module + my $path = dirname(__FILE__) . '/../../../lib/plugins'; + t::lib::Mocks::mock_config( 'pluginsdir', $path ); + + use_ok('Koha::Plugins'); + use_ok('Koha::Plugins::Handler'); + use_ok('Koha::Plugin::Test'); +} + +my $builder = t::lib::TestBuilder->new; +my $schema = Koha::Database->new->schema; + +t::lib::Mocks::mock_config( 'enable_plugins', 1 ); + +subtest 'installed_backends() tests' => sub { + + # dir backend = An ILL backend installed through backend_directory in koha-conf.xml + # plugin backend = An ILL backend installed through a plugin + + plan tests => 2; + + $schema->storage->txn_begin; + + # Install a plugin_backend + my $plugins = Koha::Plugins->new; + $plugins->InstallPlugins; + is_deeply( + Koha::ILL::Backends->installed_backends, ['Test Plugin'], + 'Only one backend installed, happens to be a plugin' + ); + + # Install a dir backend + my $dir_backend = '/tmp/ill_backend_test/Old_Backend'; + my $ill_config = Test::MockModule->new('Koha::ILL::Request::Config'); + $ill_config->mock( + 'backend_dir', + sub { + return '/tmp/ill_backend_test'; + } + ); + make_path($dir_backend); + my $installed_backends = Koha::ILL::Backends->installed_backends; + is_deeply( + $installed_backends, [ 'Old_Backend', 'Test Plugin' ], + 'Two backends are installed, one plugin and one directory backend' + ); + + #cleanup + remove_tree($dir_backend); + Koha::Plugins::Methods->delete; + $schema->storage->txn_rollback; +}; --- a/t/lib/plugins/Koha/Plugin/Test.pm +++ a/t/lib/plugins/Koha/Plugin/Test.pm @@ -421,6 +421,11 @@ sub transform_prepared_letter { Koha::Exception->throw("transform_prepared_letter called with letter content $params->{letter}->{content}"); } +sub ill_backend { + my ( $class, $args ) = @_; + return 'Test Plugin'; +} + sub auth_client_get_user { my ( $self, $params ) = @_; --