gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 24612: Fix existing ReserveSlip tests

This commit is contained in:
Jonathan Druart 2020-05-22 11:20:00 +02:00 committed by Aleisha Amohia
parent cbe1b8bb57
commit 2f4da723da
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/db_dependent/Reserves.t
View File

@ -309,7 +309,7 @@ is( $messages->{ResFound}->{borrowernumber},
$biblio = Koha::Biblios->find( $biblionumber );
$holds = $biblio->holds;
is($holds->count, 1, "Only one reserves for this biblio");
my $reserve_id = $holds->next->reserve_id;
$holds->next->reserve_id;
# Tests for bug 9761 (ConfirmFutureHolds): new CheckReserves lookahead parameter, and corresponding change in AddReturn
# Note that CheckReserve uses its lookahead parameter and does not check ConfirmFutureHolds pref (it should be passed if needed like AddReturn does)
@ -332,7 +332,7 @@ $resdate= dt_from_string();
$resdate->add_duration(DateTime::Duration->new(days => 4));
$resdate=output_pref($resdate);
$expdate= undef; #no expdate
AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
my $reserve_id = AddReserve($branch_1, $requesters{$branch_1}, $bibnum,
$bibitems, 1, $resdate, $expdate, $notes,
'a title', $checkitem, $found);
($status)=CheckReserves($itemnumber,undef,undef);
@ -378,7 +378,7 @@ is(
'item that is captured to fill a hold cannot be deleted',
);
my $letter = ReserveSlip( { branchcode => $branch_1, borrowernumber => $requesters{$branch_1}, biblionumber => $bibnum } );
my $letter = ReserveSlip( { branchcode => $branch_1, reserve_id => $reserve_id } );
ok(defined($letter), 'can successfully generate hold slip (bug 10949)');
# Tests for bug 9788: Does Koha::Item->current_holds return a future wait?

38
t/db_dependent/Reserves/ReserveSlip.t
View File

@ -19,7 +19,7 @@
use Modern::Perl;
use Test::More tests => 5;
use Test::More tests => 3;
use t::lib::TestBuilder;
use C4::Reserves qw( ReserveSlip );
@ -118,48 +118,16 @@ my $letter = $builder->build(
is ( ReserveSlip(), undef, "No hold slip returned if invalid or undef borrowernumber and/or biblionumber" );
is ( ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
reserve_id => $hold1->reserve_id,
})->{code},
'HOLD_SLIP', "Get a hold slip from library, patron and biblio" );
is (ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
reserve_id => $hold1->reserve_id,
})->{content},
"Hold found for $patron->{firstname}: Please pick up $biblio->{title} with barcode $item1->{barcode} at $library->{branchcode}.", "Hold slip contains correctly parsed content");
is_deeply(
ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
}),
ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
itemnumber => $item1->{itemnumber},
barcode => $item1->{barcode},
}),
"No item as param generate hold slip from first item in reserves");
isnt (
ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
})->{content},
ReserveSlip({
branchcode => $library->{branchcode},
borrowernumber => $patron->{borrowernumber},
biblionumber => $biblio->{biblionumber},
itemnumber => $item2->{itemnumber},
barcode => $item2->{barcode},
})->{content},
"Item and/or barcode as params return correct pickup item in hold slip");
$schema->storage->txn_rollback;
1;