From 5196f5eeb7985250f9cf3567a41f7a893bc11953 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 7 Nov 2016 11:10:04 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 17564: Fix t/db_dependent/Acquisition/OrderUsers.t ModReceiveOrder takes now a 'order' parameter and is mandatory. This new test file has been added after the first submission of bug 13321 and has not been updated during the rebases. Test plan: prove t/db_dependent/Acquisition/OrderUsers.t should return green Signed-off-by: Josef Moravec --- t/db_dependent/Acquisition/OrderUsers.t | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t index 7d051e8..51e7877 100644 --- a/t/db_dependent/Acquisition/OrderUsers.t +++ b/t/db_dependent/Acquisition/OrderUsers.t @@ -41,8 +41,7 @@ my $budget = C4::Budgets::GetBudget($budgetid); my @ordernumbers; my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( MARC::Record->new, '' ); -my $ordernumber; -$ordernumber = Koha::Acquisition::Order->new( +my $order = Koha::Acquisition::Order->new( { basketno => $basketno, quantity => 2, @@ -57,7 +56,8 @@ $ordernumber = Koha::Acquisition::Order->new( rrp => 10, ecost => 10, } -)->insert->{ordernumber}; +)->insert; +my $ordernumber = $order->{ordernumber}; my $invoiceid = AddInvoice( invoicenumber => 'invoice', @@ -83,10 +83,11 @@ C4::Acquisition::ModOrderUsers( $ordernumber, $borrowernumber ); my $is_added = grep { /^$borrowernumber$/ } C4::Acquisition::GetOrderUsers( $ordernumber ); is( $is_added, 1, 'ModOrderUsers should link patrons to an order' ); +$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber }); ModReceiveOrder( { biblionumber => $biblionumber, - ordernumber => $ordernumber, + order => $order, quantityreceived => 1, cost => 10, ecost => 10, @@ -99,10 +100,11 @@ ModReceiveOrder( my $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); is( scalar( @$messages ), 0, 'The letter has not been sent to message queue on receiving the order, the order is not entire received'); +$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber }); ModReceiveOrder( { biblionumber => $biblionumber, - ordernumber => $ordernumber, + order => $order, quantityreceived => 1, cost => 10, ecost => 10, -- 2.1.4