From 97d7d92234d059df9e3a518ede917041f35afae9 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 19 Oct 2017 09:02:20 -0300
Subject: [PATCH] Bug 19487: Fix MarkIssueReturned.t

MarkIssueReturned must now return directly if the issue does not exist.
We then check if the anonymous patron configuration is correct.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 60bb936bc28b73f1653207cce36f432dec094017)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 49beda21761e57d1d7b389e6a08f3327a53215b0)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../Circulation/MarkIssueReturned.t           | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/t/db_dependent/Circulation/MarkIssueReturned.t b/t/db_dependent/Circulation/MarkIssueReturned.t
index a3428ebfb8..f59d1e64af 100644
--- a/t/db_dependent/Circulation/MarkIssueReturned.t
+++ b/t/db_dependent/Circulation/MarkIssueReturned.t
@@ -36,20 +36,41 @@ my $builder = t::lib::TestBuilder->new;
 
 t::lib::Mocks::mock_preference('AnonymousPatron', '');
 
-my $branchcode = $builder->build({ source => 'Branch' })->{ branchcode };
+my $library = $builder->build({ source => 'Branch' });
 my $categorycode = $builder->build({ source => 'Category' })->{ categorycode };
 
+C4::Context->_new_userenv('xxx');
+C4::Context->set_userenv(0,0,0,'firstname','surname', $library->{branchcode}, $library->{branchname}, '', '', '');
+
 my %item_branch_infos = (
-    homebranch => $branchcode,
-    holdingbranch => $branchcode,
+    homebranch => $library->{branchcode},
+    holdingbranch => $library->{branchcode},
 );
 
-my $borrowernumber = AddMember( categorycode => $categorycode, branchcode => $branchcode );
+my $borrowernumber = AddMember( categorycode => $categorycode, branchcode => $library->{branchcode} );
+my $patron_category = $builder->build({ source => 'Category', value => { categorycode => 'NOT_X', category_type => 'P', enrolmentfee => 0 } });
+    my $patron = $builder->build({ source => 'Borrower', value => { branchcode => $library->{branchcode}, categorycode => $patron_category->{categorycode} } } );
+
+my $biblioitem = $builder->build( { source => 'Biblioitem' } );
+my $item = $builder->build(
+    {
+        source => 'Item',
+        value  => {
+            homebranch    => $library->{branchcode},
+            holdingbranch => $library->{branchcode},
+            notforloan    => 0,
+            itemlost      => 0,
+            withdrawn     => 0,
+            biblionumber  => $biblioitem->{biblionumber},
+        }
+    }
+);
+C4::Circulation::AddIssue( $patron, $item->{barcode} );
 
-eval { C4::Circulation::MarkIssueReturned( $borrowernumber, 'itemnumber', 'dropbox_branch', 'returndate', 2 ) };
+eval { C4::Circulation::MarkIssueReturned( $borrowernumber, $item->{itemnumber}, 'dropbox_branch', 'returndate', 2 ) };
 like ( $@, qr<Fatal error: the patron \(\d+\) .* AnonymousPatron>, );
 
-my $anonymous_borrowernumber = AddMember( categorycode => $categorycode, branchcode => $branchcode );
+my $anonymous_borrowernumber = AddMember( categorycode => $categorycode, branchcode => $library->{branchcode} );
 t::lib::Mocks::mock_preference('AnonymousPatron', $anonymous_borrowernumber);
 # The next call will raise an error, because data are not correctly set
 $dbh->{PrintError} = 0;
-- 
2.39.5