Browse Source

Bug 7534: (RM follow-up) Fix tests and adjust after bug 15524

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
18.11.x
Nick Clemens 4 years ago
parent
commit
b40070f4ad
  1. 2
      C4/Reserves.pm
  2. 15
      t/db_dependent/Holds.t

2
C4/Reserves.pm

@ -285,7 +285,7 @@ sub CanBookBeReserved{
my $canReserve;
foreach my $itemnumber (@itemnumbers) {
$canReserve = CanItemBeReserved( $borrowernumber, $itemnumber, $pickup_branchcode );
return $canReserve if $canReserve->{status} eq 'OK';
return { status => 'OK' } if $canReserve->{status} eq 'OK';
}
return $canReserve;
}

15
t/db_dependent/Holds.t

@ -7,7 +7,7 @@ use t::lib::TestBuilder;
use C4::Context;
use Test::More tests => 55;
use Test::More tests => 56;
use MARC::Record;
use Koha::Patrons;
use C4::Items;
@ -487,6 +487,13 @@ subtest 'Pickup location availability tests' => sub {
my ( $bibnum, $title, $bibitemnum ) = create_helper_biblio('ONLY1');
my ( $item_bibnum, $item_bibitemnum, $itemnumber )
= AddItem( { homebranch => $branch_1, holdingbranch => $branch_1 }, $bibnum );
#Add a default rule to allow some holds
$dbh->do(
q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
VALUES (?, ?, ?, ?, ?)},
{},
'*', '*', '*', 25, 99
);
my $item = Koha::Items->find($itemnumber);
my $branch_to = $builder->build({ source => 'Branch' })->{ branchcode };
my $library = Koha::Libraries->find($branch_to);
@ -495,12 +502,12 @@ subtest 'Pickup location availability tests' => sub {
t::lib::Mocks::mock_preference('UseBranchTransferLimits', 1);
t::lib::Mocks::mock_preference('BranchTransferLimitsType', 'itemtype');
$library->pickup_location('1')->store;
is(CanItemBeReserved($patron, $item->itemnumber, $branch_to),
is(CanItemBeReserved($patron, $item->itemnumber, $branch_to)->{status},
'OK', 'Library is a pickup location');
$library->pickup_location('0')->store;
is(CanItemBeReserved($patron, $item->itemnumber, $branch_to),
is(CanItemBeReserved($patron, $item->itemnumber, $branch_to)->{status},
'libraryNotPickupLocation', 'Library is not a pickup location');
is(CanItemBeReserved($patron, $item->itemnumber, 'nonexistent'),
is(CanItemBeReserved($patron, $item->itemnumber, 'nonexistent')->{status},
'libraryNotFound', 'Cannot set unknown library as pickup location');
};

Loading…
Cancel
Save