From f535dff2ef28a9cfe85e8d1e48751c6478dbc8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Mon, 3 Feb 2020 10:20:17 +0000 Subject: [PATCH] Bug 18936: (QA follow-up) Convert remaining tests to use Koha::CirculationRules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These two uses of Koha::IssuingRule were forgotten so this converts them to use the new Koha::CirculationRules object. Signed-off-by: Joonas Kylmälä --- t/db_dependent/SIP/Transaction.t | 49 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/t/db_dependent/SIP/Transaction.t b/t/db_dependent/SIP/Transaction.t index c33ba31670..3e8edbf60f 100755 --- a/t/db_dependent/SIP/Transaction.t +++ b/t/db_dependent/SIP/Transaction.t @@ -16,6 +16,7 @@ use C4::SIP::ILS::Transaction::FeePayment; use C4::SIP::ILS::Transaction::Hold; use C4::Reserves; +use Koha::CirculationRules; my $schema = Koha::Database->new->schema; $schema->storage->txn_begin; @@ -65,16 +66,20 @@ subtest fill_holds_at_checkout => sub { } }); - Koha::IssuingRule->new({ - categorycode => $borrower->{categorycode}, - itemtype => $itype->{itemtype}, - branchcode => $branch->{branchcode}, - onshelfholds => 1, - reservesallowed => 3, - holds_per_record => 3, - issuelength => 5, - lengthunit => 'days', - })->store; + Koha::CirculationRules->set_rules( + { + categorycode => $borrower->{categorycode}, + branchcode => $branch->{branchcode}, + itemtype => $itype->{itemtype}, + rules => { + onshelfholds => 1, + reservesallowed => 3, + holds_per_record => 3, + issuelength => 5, + lengthunit => 'days', + } + } + ); my $reserve1 = AddReserve($branch->{branchcode},$borrower->{borrowernumber},$biblio->{biblionumber}); my $reserve2 = AddReserve($branch->{branchcode},$borrower->{borrowernumber},$biblio->{biblionumber}); @@ -154,16 +159,20 @@ subtest cancel_hold => sub { library => $library->branchcode, }); - Koha::IssuingRule->new({ - categorycode => $patron->categorycode, - itemtype => $item->effective_itemtype, - branchcode => $library->branchcode, - onshelfholds => 1, - reservesallowed => 3, - holds_per_record => 3, - issuelength => 5, - lengthunit => 'days', - })->store; + Koha::CirculationRules->set_rules( + { + categorycode => $patron->categorycode, + branchcode => $library->branchcode, + itemtype => $item->effective_itemtype, + rules => { + onshelfholds => 1, + reservesallowed => 3, + holds_per_record => 3, + issuelength => 5, + lengthunit => 'days', + } + } + ); my $reserve1 = AddReserve( $library->branchcode, $patron->borrowernumber, -- 2.11.0