From d538300cb6e9f42a7a4db68072fab31041593619 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 2 Jun 2021 15:05:08 +0000 Subject: [PATCH] Bug 28503: Unit tests Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit a4cdeaae3f82ea47fe3fba5e79f419e6911fb524) Signed-off-by: Fridolin Somers (cherry picked from commit 77515dbb4db68dd40b058834b2293ad704b5e2bc) Signed-off-by: Victor Grousset/tuxayo --- misc/cronjobs/update_patrons_category.pl | 1 + t/db_dependent/Reserves.t | 65 +++++++++++++++++++++++- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/misc/cronjobs/update_patrons_category.pl b/misc/cronjobs/update_patrons_category.pl index 86541a818d..fd4bc4a7ea 100755 --- a/misc/cronjobs/update_patrons_category.pl +++ b/misc/cronjobs/update_patrons_category.pl @@ -47,6 +47,7 @@ update_patrons_category.pl -f=categorycode -t=categorycode update_patrons_category.pl --help | --man Options: + --help brief help message --man full documentation -too_old update if over maximum age for current category diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t index a058735b0d..0c92f7321a 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -1079,9 +1079,9 @@ subtest 'RevertWaitingStatus' => sub { ); }; -subtest 'CheckReserves additional test' => sub { +subtest 'CheckReserves additional tests' => sub { - plan tests => 3; + plan tests => 8; my $item = $builder->build_sample_item; my $reserve1 = $builder->build_object( @@ -1155,6 +1155,67 @@ subtest 'CheckReserves additional test' => sub { $reserve1->reserve_id, "We got the Transit reserve" ); is( scalar @$possible_reserves, 2, 'We do get both reserves' ); + my $patron_B = $builder->build_object({ class => "Koha::Patrons" }); + my $item_A = $builder->build_sample_item; + my $item_B = $builder->build_sample_item({ + homebranch => $patron_B->branchcode, + biblionumber => $item_A->biblionumber, + itype => $item_A->itype + }); + Koha::CirculationRules->set_rules( + { + branchcode => undef, + categorycode => undef, + itemtype => $item_A->itype, + rules => { + reservesallowed => 25, + holds_per_record => 1, + } + } + ); + Koha::CirculationRules->set_rule({ + branchcode => undef, + itemtype => $item_A->itype, + rule_name => 'holdallowed', + rule_value => 'from_home_library' + }); + my $reserve_id = AddReserve( + { + branchcode => $patron_B->branchcode, + borrowernumber => $patron_B->borrowernumber, + biblionumber => $item_A->biblionumber, + priority => 1, + itemnumber => undef, + } + ); + + ok( $reserve_id, "We can place a record level hold because one item is owned by patron's home library"); + t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary'); + ( $status, $matched_reserve, $possible_reserves ) = CheckReserves( $item_A->itemnumber ); + is( $status, "", "We do not fill the hold with item A because it is not from the patron's homebranch"); + Koha::CirculationRules->set_rule({ + branchcode => $item_A->homebranch, + itemtype => $item_A->itype, + rule_name => 'holdallowed', + rule_value => 'from_any_library' + }); + ( $status, $matched_reserve, $possible_reserves ) = CheckReserves( $item_A->itemnumber ); + is( $status, "Reserved", "We fill the hold with item A because item's branch rule says allow any"); + + + # Changing the control branch should change only the rule we get + t::lib::Mocks::mock_preference('ReservesControlBranch', 'PatronLibrary'); + ( $status, $matched_reserve, $possible_reserves ) = CheckReserves( $item_A->itemnumber ); + is( $status, "", "We do not fill the hold with item A because it is not from the patron's homebranch"); + Koha::CirculationRules->set_rule({ + branchcode => $patron_B->branchcode, + itemtype => $item_A->itype, + rule_name => 'holdallowed', + rule_value => 'from_any_library' + }); + ( $status, $matched_reserve, $possible_reserves ) = CheckReserves( $item_A->itemnumber ); + is( $status, "Reserved", "We fill the hold with item A because patron's branch rule says allow any"); + }; subtest 'ModReserveAffect logging' => sub { -- 2.39.5