From 5613ca4165c64b40e80a772997b3180755b7e437 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 23 Jan 2020 10:47:17 +0100
Subject: [PATCH] Bug 24487: Add 2 more tests

And make sure tests pass if there is no patron with borrowernumber=10 in
DB.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Ammended test description
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
---
 t/db_dependent/Koha/REST/Plugin/Objects.t | 31 +++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/t/db_dependent/Koha/REST/Plugin/Objects.t b/t/db_dependent/Koha/REST/Plugin/Objects.t
index 3575bbbdcc..63e2123725 100644
--- a/t/db_dependent/Koha/REST/Plugin/Objects.t
+++ b/t/db_dependent/Koha/REST/Plugin/Objects.t
@@ -65,10 +65,16 @@ get '/patrons/:patron_id/holds' => sub {
     $params->{patron_id} = $c->stash("patron_id");
     $c->validation->output($params);
     my $holds_set = Koha::Holds->new;
-    my $holds     = $c->objects->search( $holds_set );
+    my $holds     = $c->objects->search( $holds_set, \&to_model_holds );
     $c->render( status => 200, json => {count => scalar(@$holds)} );
 };
 
+sub to_model_holds {
+    my ($params) = @_;
+    $params->{borrowernumber} = delete $params->{patron_id};
+    return $params;
+}
+
 sub to_model {
     my $params = shift;
 
@@ -99,12 +105,12 @@ use Koha::Database;
 my $schema = Koha::Database->new->schema;
 my $builder = t::lib::TestBuilder->new;
 
+my $t = Test::Mojo->new;
+
 subtest 'objects.search helper' => sub {
 
     plan tests => 90;
 
-    my $t = Test::Mojo->new;
-
     $schema->storage->txn_begin;
 
     # Remove existing cities to have more control on the search restuls
@@ -285,13 +291,22 @@ subtest 'objects.search helper, sorting on mapped column' => sub {
 };
 
 subtest 'objects.search helper, with path parameters and _match' => sub {
-    plan tests => 4;
+    plan tests => 8;
 
     $schema->storage->txn_begin;
 
     Koha::Holds->search()->delete;
 
-    $builder->build_object({class=>"Koha::Holds", value => {borrowernumber => 10 }});
+    my $patron = Koha::Patrons->find(10);
+    $patron->delete if $patron;
+    $patron = $builder->build_object( { class => "Koha::Patrons" } );
+    $patron->borrowernumber(10)->store;
+    $builder->build_object(
+        {
+            class => "Koha::Holds",
+            value => { borrowernumber => $patron->borrowernumber }
+        }
+    );
 
     $t->get_ok('/patrons/1/holds?_match=exact')
       ->json_is('/count' => 0, 'there should be no holds for borrower 1 with _match=exact');
@@ -299,5 +314,11 @@ subtest 'objects.search helper, with path parameters and _match' => sub {
     $t->get_ok('/patrons/1/holds?_match=contains')
       ->json_is('/count' => 0, 'there should be no holds for borrower 1 with _match=contains');
 
+    $t->get_ok('/patrons/10/holds?_match=exact')
+      ->json_is('/count' => 1, 'there should be 1 hold for borrower 10 with _match=exact');
+
+    $t->get_ok('/patrons/10/holds?_match=contains')
+      ->json_is('/count' => 1, 'there should be 1 hold for borrower 10 with _match=contains');
+
     $schema->storage->txn_rollback;
 };
-- 
2.39.5