From c48646e956b2ec8105f818be9ee6cc275372cc6f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 9 Nov 2016 11:25:16 +0000 Subject: [PATCH] Bug 17583: Fix tests Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- Koha/Patron.pm | 3 ++- t/db_dependent/Koha/Patrons.t | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 5c0c3f2bb5..e3814c2414 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -308,9 +308,10 @@ sub is_going_to_expired { my $delay = C4::Context->preference('NotifyBorrowerDeparture') || 0; + return 0 unless $delay; return 0 unless $self->dateexpiry; return 0 if $self->dateexpiry eq '0000-00-00'; - return 1 if dt_from_string( $self->dateexpiry )->add( days => $delay ) < dt_from_string; + return 1 if dt_from_string( $self->dateexpiry )->add( days => -$delay ) < dt_from_string; return 0; } diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t index 47fdea1914..a4fd9b0855 100644 --- a/t/db_dependent/Koha/Patrons.t +++ b/t/db_dependent/Koha/Patrons.t @@ -202,30 +202,29 @@ subtest 'is_going_to_expired' => sub { is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is today'); t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 0); - my $dt_from_string = dt_from_string; - $patron->dateexpiry( $dt_from_string )->store; + $patron->dateexpiry( dt_from_string )->store; is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is today and pref is 0'); t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 10); $patron->dateexpiry( dt_from_string->add( days => 11 ) )->store; - is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 11 days before and pref is 10'); + is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 11 days ahead and pref is 10'); t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 0); $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store; - is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 10 days before and pref is 0'); + is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 10 days ahead and pref is 0'); t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 10); $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store; - is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 10 days before and pref is 10'); + is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 10 days ahead and pref is 10'); $patron->delete; t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 10); $patron->dateexpiry( dt_from_string->add( days => 20 ) )->store; - is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 20 days before and pref is 10'); + is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is 20 days ahead and pref is 10'); t::lib::Mocks::mock_preference('NotifyBorrowerDeparture', 20); $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store; - is( $patron->is_going_to_expired, 1, 'Patron should be considered going to expire if dateexpiry is 10 days before and pref is 20'); + is( $patron->is_going_to_expired, 1, 'Patron should be considered going to expire if dateexpiry is 10 days ahead and pref is 20'); $patron->delete; }; -- 2.11.4.GIT