Bug 27797: (QA follow-up) Additional tests and operator change

I added a few tests to cover additional cases and found the operator precedence
was failing, switched 'and' to '&&'

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Koha/REST/V1/Holds.pm b/Koha/REST/V1/Holds.pm
index 01bbf97..d4530e7 100644 (file)
--- a/Koha/REST/V1/Holds.pm
+++ b/Koha/REST/V1/Holds.pm
@@ -172,7 +172,7 @@ sub add {
         }
 
         my $overrides = $c->stash('koha.overrides');
-        my $can_override = $overrides->{any} and C4::Context->preference('AllowHoldPolicyOverride');
+        my $can_override = $overrides->{any} && C4::Context->preference('AllowHoldPolicyOverride');
 
         unless ( $can_override || $can_place_hold->{status} eq 'OK' ) {
             return $c->render(

diff --git a/t/db_dependent/api/v1/holds.t b/t/db_dependent/api/v1/holds.t
index 1297a5a..774508d 100755 (executable)
--- a/t/db_dependent/api/v1/holds.t
+++ b/t/db_dependent/api/v1/holds.t
@@ -358,7 +358,7 @@ $schema->storage->txn_rollback;
 
 subtest 'x-koha-override and AllowHoldPolicyOverride tests' => sub {
 
-    plan tests => 8;
+    plan tests => 12;
 
     $schema->storage->txn_begin;
 
@@ -407,6 +407,11 @@ subtest 'x-koha-override and AllowHoldPolicyOverride tests' => sub {
       ->status_is(403)
       ->json_is( '/error' => "Hold cannot be placed. Reason: ageRestricted" );
 
+    # x-koha-override doesn't override if AllowHoldPolicyOverride not set
+    $t->post_ok( "//$userid:$password@/api/v1/holds" =>
+          { 'x-koha-override' => 'any' } => json => $post_data )
+      ->status_is(403);
+
     t::lib::Mocks::mock_preference( 'AllowHoldPolicyOverride', 1 );
 
     $can_item_be_reserved_result = { status => 'pickupNotInHoldGroup' };
@@ -416,8 +421,14 @@ subtest 'x-koha-override and AllowHoldPolicyOverride tests' => sub {
       ->json_is(
         '/error' => "Hold cannot be placed. Reason: pickupNotInHoldGroup" );
 
+    # x-koha-override overrides the status
+    $t->post_ok( "//$userid:$password@/api/v1/holds" =>
+          { 'x-koha-override' => 'any' } => json => $post_data )
+      ->status_is(201);
+
     $can_item_be_reserved_result = { status => 'OK' };
 
+    # x-koha-override works when status not need override
     $t->post_ok( "//$userid:$password@/api/v1/holds" =>
           { 'x-koha-override' => 'any' } => json => $post_data )
       ->status_is(201);