Lines 2-8
Link Here
|
2 |
|
2 |
|
3 |
use Modern::Perl; |
3 |
use Modern::Perl; |
4 |
|
4 |
|
|
|
5 |
<<<<<<< HEAD |
5 |
use Test::More tests => 23; |
6 |
use Test::More tests => 23; |
|
|
7 |
======= |
8 |
use Test::More tests => 25; |
9 |
>>>>>>> Bug 8868: ILS-DI: CancelHold needs to take a reserve_id (follow-up) |
6 |
use MARC::Record; |
10 |
use MARC::Record; |
7 |
use DateTime::Duration; |
11 |
use DateTime::Duration; |
8 |
|
12 |
|
Lines 221-226
is( $messages->{ResFound}->{borrowernumber},
Link Here
|
221 |
$requesters{'RPL'}, |
225 |
$requesters{'RPL'}, |
222 |
'for generous library, its items fill first hold request in line (bug 10272)'); |
226 |
'for generous library, its items fill first hold request in line (bug 10272)'); |
223 |
|
227 |
|
|
|
228 |
my (undef, $reserves) = GetReservesFromBiblionumber($biblionumber); |
229 |
isa_ok($reserves, 'ARRAY'); |
230 |
is(scalar @$reserves, 1, "Only one reserves for this biblio"); |
231 |
my $reserve_id = $reserves->[0]->{reserve_id}; |
232 |
|
233 |
$reserve = GetReserve($reserve_id); |
234 |
isa_ok($reserve, 'HASH', "GetReserve return"); |
235 |
is($reserve->{biblionumber}, $biblionumber); |
236 |
|
237 |
$reserve = CancelReserveFromId($reserve_id); |
238 |
isa_ok($reserve, 'HASH', "CancelReserveFromId return"); |
239 |
is($reserve->{biblionumber}, $biblionumber); |
240 |
|
241 |
$reserve = GetReserve($reserve_id); |
242 |
is($reserve, undef, "GetReserve returns undef after deletion"); |
243 |
|
244 |
$reserve = CancelReserveFromId($reserve_id); |
245 |
is($reserve, undef, "CancelReserveFromId return undef if reserve does not exist"); |
246 |
|
247 |
|
224 |
# Tests for bug 9761 (ConfirmFutureHolds): new CheckReserves lookahead parameter, and corresponding change in AddReturn |
248 |
# Tests for bug 9761 (ConfirmFutureHolds): new CheckReserves lookahead parameter, and corresponding change in AddReturn |
225 |
# Note that CheckReserve uses its lookahead parameter and does not check ConfirmFutureHolds pref (it should be passed if needed like AddReturn does) |
249 |
# Note that CheckReserve uses its lookahead parameter and does not check ConfirmFutureHolds pref (it should be passed if needed like AddReturn does) |
226 |
# Test 9761a: Add a reserve without date, CheckReserve should return it |
250 |
# Test 9761a: Add a reserve without date, CheckReserve should return it |
227 |
- |
|
|