From 5b06c361d6c9a45fb07c853f07fb9aa5d4d77c37 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 11 Nov 2020 02:37:55 +0000 Subject: [PATCH] Bug 26963: (follow-up) Change subroutine name for QA tools It didn't like the ending _at Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- Koha/Item.pm | 8 ++++---- t/db_dependent/Koha/Item.t | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Koha/Item.pm b/Koha/Item.pm index 9766d8be29..71f6b7827b 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -553,9 +553,9 @@ sub can_be_transferred { } -=head3 _can_pickup_at +=head3 _can_pickup_locations -$item->_can_pickup_at({ to => $to_libraries, from => $from_library }) +$item->_can_pickup_locations({ to => $to_libraries, from => $from_library }) Checks if an item can be transferred to given libraries. This feature is controlled by two system preferences: @@ -577,7 +577,7 @@ If checking only one library please use $item->can_be_transferred. =cut -sub _can_pickup_at { +sub _can_pickup_locations { my ($self, $params ) = @_; my $to = $params->{to}; @@ -658,7 +658,7 @@ sub pickup_locations { })->as_list; } - my $pickup_locations = $self->_can_pickup_at({ + my $pickup_locations = $self->_can_pickup_locations({ to => \@libs }); diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t index d24416045d..e8fd36a9a8 100755 --- a/t/db_dependent/Koha/Item.t +++ b/t/db_dependent/Koha/Item.t @@ -339,7 +339,7 @@ subtest 'pickup_locations' => sub { $schema->storage->txn_rollback; }; -subtest '_can_pickup_at' => sub { +subtest '_can_pickup_locations' => sub { plan tests =>8; $schema->storage->txn_begin; @@ -359,7 +359,7 @@ subtest '_can_pickup_at' => sub { my @to = ( $library1, $library2, $library3, $library4 ); - my $pickup_locations = $item->_can_pickup_at({ to => \@to }); + my $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 3, "With no transfer limits we get back the libraries that are pickup locations"); t::lib::Mocks::mock_preference('UseBranchTransferLimits', 1); @@ -372,7 +372,7 @@ subtest '_can_pickup_at' => sub { } }); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 2, "With a transfer limits we get back the libraries that are pickup locations minus 1 limited library"); $builder->build_object( { class => 'Koha::Item::Transfer::Limits', value => { @@ -383,11 +383,11 @@ subtest '_can_pickup_at' => sub { } }); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 1, "With 2 transfer limits we get back the libraries that are pickup locations minus 2 limited libraries"); t::lib::Mocks::mock_preference('BranchTransferLimitsType', 'ccode'); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 3, "With no transfer limits of type ccode we get back the libraries that are pickup locations"); $builder->build_object( { class => 'Koha::Item::Transfer::Limits', value => { @@ -398,7 +398,7 @@ subtest '_can_pickup_at' => sub { } }); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 2, "With a transfer limits we get back the libraries that are pickup locations minus 1 limited library"); $builder->build_object( { class => 'Koha::Item::Transfer::Limits', value => { @@ -409,16 +409,16 @@ subtest '_can_pickup_at' => sub { } }); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 1, "With 2 transfer limits we get back the libraries that are pickup locations minus 2 limited libraries"); - $pickup_locations = $item->_can_pickup_at({ to => \@to, from => $library2 }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to, from => $library2 }); is( scalar @$pickup_locations, 3, "With transfer limits enabled but not applying because of 'from' we get back the libraries that are pickup locations"); t::lib::Mocks::mock_preference('UseBranchTransferLimits', 0); - $pickup_locations = $item->_can_pickup_at({ to => \@to }); + $pickup_locations = $item->_can_pickup_locations({ to => \@to }); is( scalar @$pickup_locations, 3, "With transfer limits disabled we get back the libraries that are pickup locations"); }; -- 2.39.5