Bugzilla – Attachment 57527 Details for
Bug 17583
Use Koha::Patron->is_expired from circulation.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 17583: Make sure we are comparing 2 dates
SIGNED-OFF-Bug-17583-Make-sure-we-are-comparing-2-.patch (text/plain), 4.16 KB, created by
Josef Moravec
on 2016-11-16 08:06:11 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 17583: Make sure we are comparing 2 dates
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2016-11-16 08:06:11 UTC
Size:
4.16 KB
patch
obsolete
>From 0922a19593f5f784dd33b70ce9e32b67126a4c10 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 9 Nov 2016 13:24:09 +0000 >Subject: [PATCH] [SIGNED-OFF] Bug 17583: Make sure we are comparing 2 dates > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > Koha/Patron.pm | 2 +- > t/db_dependent/Koha/Patrons.t | 18 +++++++++--------- > 2 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/Koha/Patron.pm b/Koha/Patron.pm >index 5fb6fac..dac2593 100644 >--- a/Koha/Patron.pm >+++ b/Koha/Patron.pm >@@ -298,7 +298,7 @@ sub is_going_to_expired { > 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->truncate( to => 'day' ); > return 0; > } > >diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t >index 0641594..3e4ae8e 100644 >--- a/t/db_dependent/Koha/Patrons.t >+++ b/t/db_dependent/Koha/Patrons.t >@@ -187,36 +187,36 @@ subtest 'is_going_to_expired' => sub { > plan tests => 9; > my $patron = $builder->build({ source => 'Borrower' }); > $patron = Koha::Patrons->find( $patron->{borrowernumber} ); >- $patron->dateexpiry( undef )->store; >+ $patron->dateexpiry( undef )->store->discard_changes; > is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is not set'); >- $patron->dateexpiry( '0000-00-00' )->store; >+ $patron->dateexpiry( '0000-00-00' )->store->discard_changes; > is( $patron->is_going_to_expired, 0, 'Patron should not be considered going to expire if dateexpiry is not 0000-00-00'); >- $patron->dateexpiry( dt_from_string )->store; >+ $patron->dateexpiry( dt_from_string )->store->discard_changes; > 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); >- $patron->dateexpiry( dt_from_string )->store; >+ $patron->dateexpiry( dt_from_string )->store->discard_changes; > 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; >+ $patron->dateexpiry( dt_from_string->add( days => 11 ) )->store->discard_changes; > 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; >+ $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store->discard_changes; > 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; >+ $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store->discard_changes; > 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; >+ $patron->dateexpiry( dt_from_string->add( days => 20 ) )->store->discard_changes; > 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; >+ $patron->dateexpiry( dt_from_string->add( days => 10 ) )->store->discard_changes; > 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.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17583
:
57329
|
57330
|
57334
|
57364
|
57380
|
57384
|
57387
|
57488
|
57523
|
57524
|
57525
|
57526
|
57527
|
57528
|
57888
|
57889
|
57890
|
57891
|
57892
|
57893
|
57914
|
57915
|
57916
|
57917
|
57918
|
57919
|
57920