Bug 22917: Prevent Circulation.t if tests ran too slowly

[srvgit] / t / db_dependent / Circulation.t

diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
index b8bbcda..37ab7a5 100755 (executable)
--- a/t/db_dependent/Circulation.t
+++ b/t/db_dependent/Circulation.t
@@ -18,7 +18,7 @@
 use Modern::Perl;
 use utf8;
 
-use Test::More tests => 128;
+use Test::More tests => 130;
 use Test::MockModule;
 
 use Data::Dumper;
@@ -53,6 +53,11 @@ $schema->storage->txn_begin;
 my $builder = t::lib::TestBuilder->new;
 my $dbh = C4::Context->dbh;
 
+# Prevent random failures by mocking ->now
+my $now_value       = DateTime->now();
+my $mocked_datetime = Test::MockModule->new('DateTime');
+$mocked_datetime->mock( 'now', sub { return $now_value->clone; } );
+
 # Start transaction
 $dbh->{RaiseError} = 1;
 
@@ -1988,6 +1993,8 @@ subtest 'AddReturn | is_overdue' => sub {
 
     my $library = $builder->build( { source => 'Branch' } );
     my $patron  = $builder->build( { source => 'Borrower', value => { categorycode => $patron_category->{categorycode} } } );
+    my $manager = $builder->build_object({ class => "Koha::Patrons" });
+    t::lib::Mocks::mock_userenv({ patron => $manager, branchcode => $manager->branchcode });
 
     my $biblioitem = $builder->build( { source => 'Biblioitem' } );
     my $item = $builder->build(
@@ -2438,7 +2445,10 @@ subtest '_FixAccountForLostAndReturned' => sub {
 };
 
 subtest '_FixOverduesOnReturn' => sub {
-    plan tests => 6;
+    plan tests => 9;
+
+    my $manager = $builder->build_object({ class => "Koha::Patrons" });
+    t::lib::Mocks::mock_userenv({ patron => $manager, branchcode => $manager->branchcode });
 
     my $biblio = $builder->build_sample_biblio({ author => 'Hall, Kylie' });
 
@@ -2475,7 +2485,6 @@ subtest '_FixOverduesOnReturn' => sub {
     is( $accountline->amountoutstanding, '99.000000', 'Fine has the same amount outstanding as previously' );
     is( $accountline->status, 'RETURNED', 'Open fine ( account type OVERDUE ) has been closed out ( status RETURNED )');
 
-
     ## Run again, with exemptfine enabled
     $accountline->set(
         {
@@ -2494,6 +2503,10 @@ subtest '_FixOverduesOnReturn' => sub {
     is( $accountline->status, 'FORGIVEN', 'Open fine ( account type OVERDUE ) has been set to fine forgiven ( status FORGIVEN )');
     is( ref $offset, "Koha::Account::Offset", "Found matching offset for fine reduction via forgiveness" );
     is( $offset->amount, '-99.000000', "Amount of offset is correct" );
+    my $credit = $offset->credit;
+    is( ref $credit, "Koha::Account::Line", "Found matching credit for fine forgiveness" );
+    is( $credit->amount, '-99.000000', "Credit amount is set correctly" );
+    is( $credit->amountoutstanding + 0, 0, "Credit amountoutstanding is correctly set to 0" );
 };
 
 subtest 'Set waiting flag' => sub {