@@ -, +, @@ --- t/db_dependent/Holds/CancelReserves.t | 2 +- t/db_dependent/Holds/WaitingReserves.t | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) --- a/t/db_dependent/Holds/CancelReserves.t +++ a/t/db_dependent/Holds/CancelReserves.t @@ -78,7 +78,7 @@ my $reserve3 = $builder->build({ }, }); -Koha::Cache->get_instance()->flush_all(); +Koha::Caches->get_instance()->flush_all(); my $holiday = $builder->build({ source => 'SpecialHoliday', value => { --- a/t/db_dependent/Holds/WaitingReserves.t +++ a/t/db_dependent/Holds/WaitingReserves.t @@ -19,6 +19,8 @@ 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(); @@ -111,6 +113,16 @@ my $item4 = $builder->build({ }, }); +my $letter = $builder->build({ + source => 'Letter', + value => { + module => 'reserves', + code => 'HOLD', + message_transport_type => 'print', + branchcode => '', + }, +}); + my $today = dt_from_string(); my $reserve1_reservedate = $today->clone; @@ -135,7 +147,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' ); @@ -157,7 +169,7 @@ my $reserve2 = $builder->build({ }, }); -ModReserveAffect( $item2->{itemnumber}, $patron2->{borrowernumber}, 1); +ModReserveAffect( $item2->{itemnumber}, $patron2->{borrowernumber}); my $r2 = Koha::Holds->find($reserve2->{reserve_id}); is($r2->found, 'T', '2nd reserve - Reserve status is now "To transfer"' ); @@ -207,8 +219,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; --