Bug 18403: Add new method Koha::Library::Group->has_child

[koha.git] / t / db_dependent / Holds / WaitingReserves.t

diff --git a/t/db_dependent/Holds/WaitingReserves.t b/t/db_dependent/Holds/WaitingReserves.t
index 6167f43..292061d 100644 (file)
--- a/t/db_dependent/Holds/WaitingReserves.t
+++ b/t/db_dependent/Holds/WaitingReserves.t
@@ -8,7 +8,7 @@ use Koha::DateUtils;
 use t::lib::Mocks;
 use t::lib::TestBuilder;
 
-use Test::More tests => 10;
+use Test::More tests => 11;
 
 use_ok('C4::Reserves');
 
@@ -16,9 +16,9 @@ my $schema  = Koha::Database->new->schema;
 $schema->storage->txn_begin;
 
 my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
 $dbh->do(q{DELETE FROM special_holidays});
+$dbh->do(q{DELETE FROM repeatable_holidays});
+$dbh->do("DELETE FROM reserves");
 
 my $builder = t::lib::TestBuilder->new();
 
@@ -77,6 +77,12 @@ my $biblio3 = $builder->build({
         title => 'Title 3',    },
 });
 
+my $biblio4 = $builder->build({
+    source => 'Biblio',
+    value  => {
+        title => 'Title 4',    },
+});
+
 my $item1 = $builder->build({
     source => 'Item',
     value  => {
@@ -98,6 +104,13 @@ my $item3 = $builder->build({
     },
 });
 
+my $item4 = $builder->build({
+    source => 'Item',
+    value  => {
+        biblionumber => $biblio4->{biblionumber},
+    },
+});
+
 my $today = dt_from_string();
 
 my $reserve1_reservedate = $today->clone;
@@ -122,7 +135,7 @@ my $reserve1 = $builder->build({
 t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelay', 1);
 t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 6);
 
-ModReserveAffect( $item1->{itemnumber}, $patron1->{borrowernumber}, 0);
+ModReserveAffect( $item1->{itemnumber}, $patron1->{borrowernumber});
 my $r = Koha::Holds->find($reserve1->{reserve_id});
 
 is($r->waitingdate, $today->ymd, 'Waiting date should be set to today' );
@@ -167,7 +180,6 @@ my $reserve3 = $builder->build({
 my $special_holiday1_dt = $today->clone;
 $special_holiday1_dt->add(days => 2);
 
-Koha::Cache->get_instance()->flush_all();
 my $holiday = $builder->build({
     source => 'SpecialHoliday',
     value => {
@@ -195,8 +207,10 @@ my $holiday2 = $builder->build({
     },
 });
 
+Koha::Caches->get_instance->flush_all;
+
 t::lib::Mocks::mock_preference('ExcludeHolidaysFromMaxPickUpDelay', 1);
-ModReserveAffect( $item3->{itemnumber}, $patron2->{borrowernumber}, 0);
+ModReserveAffect( $item3->{itemnumber}, $patron2->{borrowernumber});
 
 # Add 6 days of pickup delay + 1 day of holiday.
 my $expected_expiration = $today->clone;
@@ -205,4 +219,26 @@ $expected_expiration->add(days => 8);
 my $r3 = Koha::Holds->find($reserve3->{reserve_id});
 is($r3->expirationdate, $expected_expiration->ymd, 'Expiration date should be set to today + 7' );
 
-$dbh->rollback;
\ No newline at end of file
+my $reserve4_reservedate = $today->clone;
+my $requested_expiredate = $today->clone()->add(days => 6);
+
+my $reserve4 = $builder->build({
+    source => 'Reserve',
+    value => {
+        borrowernumber => $patron2->{borrowernumber},
+        reservedate => $reserve4_reservedate->ymd,
+        expirationdate => $requested_expiredate->ymd,
+        biblionumber => $biblio4->{biblionumber},
+        branchcode => 'LIB1',
+        priority => 1,
+        found => '',
+    },
+});
+
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 10);
+ModReserveAffect( $item4->{itemnumber}, $patron2->{borrowernumber}, 0, $reserve4->{reserve_id});
+
+my $r4 = Koha::Holds->find($reserve4->{reserve_id});
+is($r4->expirationdate, $requested_expiredate->ymd, 'Requested expiration date should be kept' );
+
+$schema->storage->txn_rollback;