From d0ff9cc0c5d92f38ec01db11f7d066eab54e285a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 15 Jan 2019 16:32:57 -0300 Subject: [PATCH] Bug 21206: (QA follow-up) Rebase problem and leftover mocked GetItem Signed-off-by: Tomas Cohen Arazi --- C4/Circulation.pm | 2 +- t/db_dependent/Circulation.t | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index f717cd7ca6..7cc3c341f6 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2888,7 +2888,7 @@ sub AddRenewal { branchcode => $branchcode, description => 'Renewal of Rental Item ' . $biblio->title - . " $item->barcode", + . " " . $item->barcode, } )->store(); } diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 2138468951..94df26c0b1 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -2469,16 +2469,16 @@ subtest 'Cancel transfers on lost items' => sub { #Check transfer exists and the items holding branch is the transfer destination branch before marking it as lost my ($datesent,$frombranch,$tobranch) = GetTransfers($item->{itemnumber}); is( $tobranch, $library_2->{branchcode}, 'The transfer record exists in the branchtransfers table'); - my $itemcheck = GetItem($item->{itemnumber}); - is( $itemcheck->{holdingbranch}, $library_2->{branchcode}, 'Items holding branch is the transfers destination branch before it is marked as lost' ); + my $itemcheck = Koha::Items->find($item->{itemnumber}); + is( $itemcheck->holdingbranch, $library_2->{branchcode}, 'Items holding branch is the transfers destination branch before it is marked as lost' ); #Simulate item being marked as lost and confirm the transfer is deleted and the items holding branch is the transfers source branch ModItem( { itemlost => 1 }, $biblio->{biblionumber}, $item->{itemnumber} ); LostItem( $item->{itemnumber}, 'test', 1 ); ($datesent,$frombranch,$tobranch) = GetTransfers($item->{itemnumber}); is( $tobranch, undef, 'The transfer on the lost item has been deleted as the LostItemCancelOutstandingTransfer is enabled'); - $itemcheck = GetItem($item->{itemnumber}); - is( $itemcheck->{holdingbranch}, $library_1->{branchcode}, 'Lost item with cancelled hold has holding branch equallying the transfers source branch' ); + $itemcheck = Koha::Items->find($item->{itemnumber}); + is( $itemcheck->holdingbranch, $library_1->{branchcode}, 'Lost item with cancelled hold has holding branch equallying the transfers source branch' ); }; subtest 'CanBookBeIssued | is_overdue' => sub { @@ -2862,8 +2862,6 @@ subtest 'AddRenewal and AddIssuingCharge tests' => sub { ); my $item = Koha::Items->find( $item_id ); - my $items = Test::MockModule->new('C4::Items'); - $items->mock( GetItem => $item->unblessed ); my $context = Test::MockModule->new('C4::Context'); $context->mock( userenv => { branch => $library->id } ); -- 2.11.0