From 6ce28c3c30bab261caba00898b623ab993d8bb9a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 7 Aug 2019 11:09:57 -0500 Subject: [PATCH] Bug 23463: Fix failing tests And adding a FIXME about discard_changes --- t/db_dependent/Circulation/IsItemIssued.t | 2 ++ t/db_dependent/Items_DelItemCheck.t | 1 + 2 files changed, 3 insertions(+) diff --git a/t/db_dependent/Circulation/IsItemIssued.t b/t/db_dependent/Circulation/IsItemIssued.t index 0baf8bd9a7..02d92923c4 100644 --- a/t/db_dependent/Circulation/IsItemIssued.t +++ b/t/db_dependent/Circulation/IsItemIssued.t @@ -76,6 +76,8 @@ is( AddReturn($item->barcode, $library->{branchcode}); is ( IsItemIssued( $item->itemnumber ), 0, "item has been returned" ); +$item->discard_changes; # FIXME We should not need that + # If we do not, $self->checkout in safe_to_delete will not know the item has been checked out is( $item->safe_delete, 1, diff --git a/t/db_dependent/Items_DelItemCheck.t b/t/db_dependent/Items_DelItemCheck.t index 51bd731b42..b25be149da 100644 --- a/t/db_dependent/Items_DelItemCheck.t +++ b/t/db_dependent/Items_DelItemCheck.t @@ -117,6 +117,7 @@ AddReturn( $item->barcode, $branch->{branchcode} ); t::lib::Mocks::mock_preference('IndependentBranches', 1); $item->set( { homebranch => $branch2->{branchcode}, holdingbranch => $branch2->{branchcode} })->store; +$item->discard_changes; is( $item->safe_to_delete, 'not_same_branch', -- 2.25.0