From 0e803d9c3c82c69a6ac5b2abe17542bdb7aa668a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 2 Oct 2019 11:20:27 +0100 Subject: [PATCH] Bug 23382: (follow-up) Ensure tests pass on Wednesdays --- t/db_dependent/Circulation.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index be906abd7d..a5f12d8ced 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -3348,8 +3348,9 @@ subtest 'Incremented fee tests' => sub { is( $itemtype->rentalcharge_hourly, '2.500000', 'Hourly rental charge stored and retreived correctly' ); - $dt_to = dt_from_string()->add( hours => 4 ); - $dt_to_renew = dt_from_string()->add( hours => 6 ); + $dt_to = dt_from_string()->add( hours => 4, minutes => 30 ); + $dt_to_renew = dt_from_string()->add( hours => 6, minutes => 30 ); + $calendar->delete_holiday( weekday => 3); $issue = AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from ); @@ -3416,7 +3417,7 @@ subtest 'CanBookBeIssued & RentalFeesCheckoutConfirmation' => sub { $itemtype->rentalcharge('1.000000')->store; ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef ); - is_deeply( $needsconfirmation, { RENTALCHARGE => '1' }, 'Item needs rentalcharge confirmation to be issued' ); + is_deeply( $needsconfirmation, { RENTALCHARGE => '1.00' }, 'Item needs rentalcharge confirmation to be issued' ); $itemtype->rentalcharge('0')->store; $itemtype->rentalcharge_daily('1.000000')->store; ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef ); -- 2.20.1