From 997f5a9f47badf265e5fbc585ed9a21eb5732e2b Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 22 Jun 2021 14:21:22 +0200 Subject: [PATCH] Revert "Bug 28503: Unit tests" This reverts commit 77515dbb4db68dd40b058834b2293ad704b5e2bc. --- misc/cronjobs/update_patrons_category.pl | 1 - t/db_dependent/Reserves.t | 66 +----------------------- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/misc/cronjobs/update_patrons_category.pl b/misc/cronjobs/update_patrons_category.pl index fd4bc4a7ea..86541a818d 100755 --- a/misc/cronjobs/update_patrons_category.pl +++ b/misc/cronjobs/update_patrons_category.pl @@ -47,7 +47,6 @@ 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 ab9f322757..5ff4e2aacd 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -1076,9 +1076,9 @@ subtest 'RevertWaitingStatus' => sub { ); }; -subtest 'CheckReserves additional tests' => sub { +subtest 'CheckReserves additional test' => sub { - plan tests => 8; + plan tests => 3; my $item = $builder->build_sample_item; my $reserve1 = $builder->build_object( @@ -1151,68 +1151,6 @@ subtest 'CheckReserves additional tests' => sub { is( $matched_reserve->{reserve_id}, $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 'AllowHoldOnPatronPossession test' => sub { -- 2.39.5