Attachment 83269 Details for Bug 21756 – Bug 21756: Replace manualinvoice with add_debit in tests

[patch] Bug 21756: Replace manualinvoice with add_debit in tests

Bug-21756-Replace-manualinvoice-with-adddebit-in-t.patch (text/plain), 4.57 KB, created by Martin Renvoize (ashimema) on 2018-12-17 09:02:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-12-17 09:02:25 UTC

Size: 4.57 KB

patch

obsolete

>From a1b9b3ecdf3857778052e8b0d1678ff1e102910c Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Sun, 16 Dec 2018 13:11:42 +0000
>Subject: [PATCH] Bug 21756: Replace manualinvoice with add_debit in tests
>
>---
> t/db_dependent/Circulation.t                  | 28 +++++++++++++++++--
> .../Circulation/NoIssuesChargeGuarantees.t    |  5 ++--
> t/db_dependent/api/v1/patrons_accounts.t      |  1 -
> 3 files changed, 28 insertions(+), 6 deletions(-)
>
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index 02b45c366a..a1e4f41535 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -693,19 +693,41 @@ C4::Context->dbh->do("DELETE FROM accountlines");
>         C4::Context->set_preference('OPACFineNoRenewalsBlockAutoRenew','1');
>         C4::Context->set_preference('OPACFineNoRenewals','10');
>         my $fines_amount = 5;
>-        C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
>+        my $account = Koha::Account->new({patron_id => $renewing_borrowernumber});
>+        $account->add_debit(
>+            {
>+                amount      => $fines_amount,
>+                type        => 'fine',
>+                item_id     => $item_to_auto_renew->{itemnumber},
>+                description => "Some fines"
>+            }
>+        )->accounttype->('F')->store;
>         ( $renewokay, $error ) =
>           CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
>         is( $renewokay, 0, 'Do not renew, renewal is automatic' );
>         is( $error, 'auto_renew', 'Can auto renew, OPACFineNoRenewals=10, patron has 5' );
> 
>-        C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
>+        $account->add_debit(
>+            {
>+                amount      => $fines_amount,
>+                type        => 'fine',
>+                item_id     => $item_to_auto_renew->{itemnumber},
>+                description => "Some fines"
>+            }
>+        )->accounttype->('F')->store;
>         ( $renewokay, $error ) =
>           CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
>         is( $renewokay, 0, 'Do not renew, renewal is automatic' );
>         is( $error, 'auto_renew', 'Can auto renew, OPACFineNoRenewals=10, patron has 10' );
> 
>-        C4::Accounts::manualinvoice( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber}, "Some fines", 'F', $fines_amount );
>+        $account->add_debit(
>+            {
>+                amount      => $fines_amount,
>+                type        => 'fine',
>+                item_id     => $item_to_auto_renew->{itemnumber},
>+                description => "Some fines"
>+            }
>+        )->accounttype->('F')->store;
>         ( $renewokay, $error ) =
>           CanBookBeRenewed( $renewing_borrowernumber, $item_to_auto_renew->{itemnumber} );
>         is( $renewokay, 0, 'Do not renew, renewal is automatic' );
>diff --git a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
>index 971208f494..2814405515 100644
>--- a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
>+++ b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
>@@ -22,8 +22,8 @@ use Test::More tests => 6;
> use t::lib::TestBuilder;
> use t::lib::Mocks;
> 
>-use C4::Accounts qw( manualinvoice );
> use C4::Circulation qw( CanBookBeIssued );
>+use Koha::Account;
> use Koha::Account::Lines;
> use Koha::Account::Offsets;
> 
>@@ -68,7 +68,8 @@ t::lib::Mocks::mock_preference( 'AllowFineOverride', '' );
> my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
> is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );
> 
>-manualinvoice( $guarantee->{borrowernumber}, undef, undef, 'L', 10.00 );
>+my $account = Koha::Account->new( { patron_id => $guarantee->{borrowernumber} } );
>+$account->add_debit({ amount => 10.00, type => 'lost_item' });
> ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
> is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );
> 
>diff --git a/t/db_dependent/api/v1/patrons_accounts.t b/t/db_dependent/api/v1/patrons_accounts.t
>index bf8b9de62e..bdd7d22ace 100644
>--- a/t/db_dependent/api/v1/patrons_accounts.t
>+++ b/t/db_dependent/api/v1/patrons_accounts.t
>@@ -25,7 +25,6 @@ use Test::Warn;
> use t::lib::TestBuilder;
> use t::lib::Mocks;
> 
>-use C4::Accounts qw(manualinvoice);
> use C4::Auth;
> use Koha::Account::Line;
> 
>-- 
>2.19.2

Actions: View | Diff | Splinter Review

Attachments on bug 21756: 83257 | 83258 | 83259 | 83260 | 83261 | 83262 | 83263 | 83264 | 83265 | 83266 | 83267 | 83268 | 83269 | 83270 | 83271 | 84729 | 84730 | 84731 | 84732 | 84733 | 85320 | 85321 | 85322 | 85323 | 85324 | 85325 | 85326 | 85327 | 85350 | 85420 | 85421 | 85422 | 85423 | 85424 | 85425 | 85426 | 85427 | 85428 | 85429 | 85430 | 85505 | 85506 | 85507 | 85508 | 85509 | 85510 | 85511 | 85512 | 85513 | 85514 | 85515 | 85638 | 85639 | 85640 | 85641 | 85642 | 85643 | 85644 | 85645 | 85646 | 85647 | 85648 | 85654 | 85655 | 85656 | 85657 | 85658 | 85659 | 85660 | 85661 | 85662 | 85663 | 85664 | 85665 | 86265 | 86266 | 86267 | 86268 | 86269 | 86270 | 86271 | 86272 | 86273 | 86274 | 86275 | 86276 | 86441 | 86442 | 86443 | 86444 | 86445 | 86446 | 86447 | 86448 | 86449 | 86450 | 86451 | 86452