From 558b123afd43935485a0fa8478c346461621a20a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 25 Oct 2019 11:29:58 +0100 Subject: [PATCH] Bug 23382: (follow-up) Ensure closed day is inside charge window We're testing with an hourly loan of 96 hours to catch a closed day. However, our closed day was hard coded to be a Wednesday so if you ran the tests on a Friday the 96 hour loan would not catch a Wednesday. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- t/db_dependent/Koha/Charges/Fees.t | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/Koha/Charges/Fees.t b/t/db_dependent/Koha/Charges/Fees.t index 3a14add799..b67b552f42 100644 --- a/t/db_dependent/Koha/Charges/Fees.t +++ b/t/db_dependent/Koha/Charges/Fees.t @@ -338,14 +338,16 @@ subtest 'accumulate_rentalcharge tests' => sub { ); my $calendar = C4::Calendar->new( branchcode => $library->id ); + my $day = $dt_from->day_of_week + 1; $calendar->insert_week_day_holiday( - weekday => 3, + weekday => $day, title => 'Test holiday', description => 'Test holiday' ); $charge = $fees->accumulate_rentalcharge(); + my $dayname = $dt_from->clone->add( days => 1 )->day_name; is( $charge, 5.00, -'Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays' +"Daily rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed $dayname" ); # Hourly tests @@ -379,10 +381,10 @@ subtest 'accumulate_rentalcharge tests' => sub { t::lib::Mocks::mock_preference( 'finesCalendar', 'noFinesWhenClosed' ); $charge = $fees->accumulate_rentalcharge(); is( $charge, 18.00, -'Hourly rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed Wednesdays (96h - 24h * 0.25u)' +"Hourly rental charge calculated correctly with finesCalendar = noFinesWhenClosed and closed $dayname (96h - 24h * 0.25u)" ); - $calendar->delete_holiday( weekday => 3); + $calendar->delete_holiday( weekday => $day ); $charge = $fees->accumulate_rentalcharge(); is( $charge, 24.00, 'Hourly rental charge calculated correctly with finesCalendar = noFinesWhenClosed (96h - 0h * 0.25u)' ); }; -- 2.11.0