From 894ea5df0d15c40db074b0f9058195a3075df610 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Fri, 28 Jun 2024 13:53:10 +0000 Subject: [PATCH] Bug 29087: (QA follow-up): Fix QA tests Signed-off-by: Marcel de Rooy [EDIT] Conform BZ comment31 Signed-off-by: Martin Renvoize (cherry picked from commit 7f5e1fac86bf7eaa3f217a8e41cc4522e7fe9c3c) Signed-off-by: Lucas Gass (cherry picked from commit b7ec2d2131fe9736fd83615b1c37b85b25e10942) Signed-off-by: Fridolin Somers --- Koha/Items.pm | 4 ++-- t/db_dependent/Koha/Holds.t | 4 ++-- t/db_dependent/Koha/Items.t | 12 +++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Koha/Items.pm b/Koha/Items.pm index 6bea92278b..44213bed6c 100644 --- a/Koha/Items.pm +++ b/Koha/Items.pm @@ -68,7 +68,7 @@ sub filter_by_for_hold { } ); my @hold_not_allowed_itypes; - if ( $default_rule ) { + if ($default_rule) { @hold_not_allowed_itypes = Koha::ItemTypes->search->get_column('itemtype'); my @hold_allowed_itypes = Koha::CirculationRules->search( { @@ -78,7 +78,7 @@ sub filter_by_for_hold { categorycode => undef, } )->get_column('itemtype'); - @hold_not_allowed_itypes = array_minus( @hold_not_allowed_itypes, @hold_allowed_itypes ) + @hold_not_allowed_itypes = array_minus( @hold_not_allowed_itypes, @hold_allowed_itypes ); } else { @hold_not_allowed_itypes = Koha::CirculationRules->search( { diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t index f1f32ad6a7..f125551f71 100755 --- a/t/db_dependent/Koha/Holds.t +++ b/t/db_dependent/Koha/Holds.t @@ -534,8 +534,8 @@ subtest 'get_items_that_can_fill' => sub { Koha::CirculationRules->search( { - rule_name => 'holdallowed', - rule_value => 'not_allowed', + rule_name => 'holdallowed', + rule_value => 'not_allowed', } )->delete; diff --git a/t/db_dependent/Koha/Items.t b/t/db_dependent/Koha/Items.t index 7f2cc3c664..5fb90e79ed 100755 --- a/t/db_dependent/Koha/Items.t +++ b/t/db_dependent/Koha/Items.t @@ -1935,10 +1935,10 @@ subtest 'filter_by_for_hold' => sub { rule_value => 'not_allowed', } ); - my $itemtype = $builder->build_object({ class => 'Koha::ItemTypes' }); + my $itemtype = $builder->build_object( { class => 'Koha::ItemTypes' } ); my $not_holdable_itemtype = $itemtype->itemtype; - my $itemtype2 = $builder->build_object({ class => 'Koha::ItemTypes' }); - my $holdable_itemtype = $itemtype2->itemtype; + my $itemtype2 = $builder->build_object( { class => 'Koha::ItemTypes' } ); + my $holdable_itemtype = $itemtype2->itemtype; Koha::CirculationRules->set_rule( { branchcode => undef, @@ -1952,9 +1952,11 @@ subtest 'filter_by_for_hold' => sub { my $library = $builder->build_object({ class => 'Koha::Libraries' }); t::lib::Mocks::mock_preference('IndependentBranches', 0); # more robust tests is( $biblio->items->filter_by_for_hold->count, 0, 'no item yet' ); - $builder->build_sample_item( { biblionumber => $biblio->biblionumber, notforloan => 0, itype => $not_holdable_itemtype } ); + $builder->build_sample_item( + { biblionumber => $biblio->biblionumber, notforloan => 0, itype => $not_holdable_itemtype } ); is( $biblio->items->filter_by_for_hold->count, 0, 'default rule prevents hold' ); - $builder->build_sample_item( { biblionumber => $biblio->biblionumber, notforloan => 0, itype => $holdable_itemtype } ); + $builder->build_sample_item( + { biblionumber => $biblio->biblionumber, notforloan => 0, itype => $holdable_itemtype } ); is( $biblio->items->filter_by_for_hold->count, 1, 'hold allowed despite default rule' ); # Reset items and circ rules to remove default rule -- 2.39.5