From 0fb0de366b6c725d0863e5134b9c6b7d19b55422 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 20 Sep 2021 16:11:35 +0200
Subject: [PATCH] Bug 28972: Fix failing tests

---
 t/db_dependent/HoldsQueue.t | 18 +++++++++---------
 t/db_dependent/Koha/Item.t  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
index 30f4ec3eae2..5ab204ee128 100755
--- a/t/db_dependent/HoldsQueue.t
+++ b/t/db_dependent/HoldsQueue.t
@@ -978,7 +978,7 @@ subtest "Test Local Holds Priority - Bib level" => sub {
     is( $queue_rs->count(), 1,
         "Hold queue contains one hold" );
     is(
-        $queue_rs->next->borrowernumber,
+        $queue_rs->next->borrowernumber->borrowernumber,
         $local_patron->borrowernumber,
         "We should pick the local hold over the next available"
     );
@@ -1048,7 +1048,7 @@ subtest "Test Local Holds Priority - Item level" => sub {
     is( $queue_rs->count(), 1,
         "Hold queue contains one hold" );
     is(
-        $q->borrowernumber,
+        $q->borrowernumber->borrowernumber,
         $local_patron->borrowernumber,
         "We should pick the local hold over the next available"
     );
@@ -1116,7 +1116,7 @@ subtest "Test Local Holds Priority - Item level hold over Record level hold (Bug
     is( $queue_rs->count(), 1,
         "Hold queue contains one hold" );
     is(
-        $q->borrowernumber,
+        $q->borrowernumber->borrowernumber,
         $local_patron->borrowernumber,
         "We should pick the local hold over the next available"
     );
@@ -1193,7 +1193,7 @@ subtest "Test Local Holds Priority - Get correct item for item level hold" => su
     is( $queue_rs->count(), 1,
         "Hold queue contains one hold" );
     is(
-        $q->borrowernumber,
+        $q->borrowernumber->borrowernumber,
         $local_patron->borrowernumber,
         "We should pick the local hold over the next available"
     );
@@ -1444,7 +1444,7 @@ subtest 'Excludes from local holds priority' => sub {
     my $queue_rs = $schema->resultset('TmpHoldsqueue');
     my $next = $queue_rs->next;
     is($queue_rs->count, 1, 'Only 1 patron queueud' );
-    is($next->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
+    is($next->borrowernumber->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
 
     my $item2  = $builder->build_sample_item(
         {
@@ -1458,9 +1458,9 @@ subtest 'Excludes from local holds priority' => sub {
     $queue_rs = $schema->resultset('TmpHoldsqueue');
     is( $queue_rs->count, 2, '2 patrons queued' );
     $next = $queue_rs->next;
-    is($next->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
+    is($next->borrowernumber->borrowernumber, $local_patron_not_excluded->borrowernumber, 'Not excluded local patron is queued');
     $next = $queue_rs->next;
-    is($next->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
+    is($next->borrowernumber->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
 
     $item1->exclude_from_local_holds_priority(1)->store;
 
@@ -1469,9 +1469,9 @@ subtest 'Excludes from local holds priority' => sub {
     $queue_rs = $schema->resultset('TmpHoldsqueue');
     is( $queue_rs->count, 2, '2 patrons queued' );
     $next = $queue_rs->next;
-    is($next->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
+    is($next->borrowernumber->borrowernumber, $other_patron->borrowernumber, 'Other patron is queued');
     $next = $queue_rs->next;
-    is($next->borrowernumber, $local_patron_excluded->borrowernumber, 'Excluded local patron is queued');
+    is($next->borrowernumber->borrowernumber, $local_patron_excluded->borrowernumber, 'Excluded local patron is queued');
 };
 # Cleanup
 $schema->storage->txn_rollback;
diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t
index e9cc993cd75..d44c2ffcb87 100755
--- a/t/db_dependent/Koha/Item.t
+++ b/t/db_dependent/Koha/Item.t
@@ -1034,8 +1034,8 @@ subtest 'move_to_biblio() tests' => sub {
 
     my $get_tmp_holdsqueue1 = $schema->resultset('TmpHoldsqueue')->search({ itemnumber => $tmp_holdsqueue1->{itemnumber} })->single;
     my $get_tmp_holdsqueue2 = $schema->resultset('TmpHoldsqueue')->search({ itemnumber => $tmp_holdsqueue2->{itemnumber} })->single;
-    is($get_tmp_holdsqueue1->biblionumber, $target_biblionumber, 'move_to_biblio moves tmp_holdsqueue for item 1');
-    is($get_tmp_holdsqueue2->biblionumber, $source_biblionumber, 'move_to_biblio does not move tmp_holdsqueue for item 2');
+    is($get_tmp_holdsqueue1->biblionumber->biblionumber, $target_biblionumber, 'move_to_biblio moves tmp_holdsqueue for item 1');
+    is($get_tmp_holdsqueue2->biblionumber->biblionumber, $source_biblionumber, 'move_to_biblio does not move tmp_holdsqueue for item 2');
 
     my $get_hold_fill_target1 = $schema->resultset('HoldFillTarget')->search({ itemnumber => $hold_fill_target1->{itemnumber} })->single;
     my $get_hold_fill_target2 = $schema->resultset('HoldFillTarget')->search({ itemnumber => $hold_fill_target2->{itemnumber} })->single;
-- 
2.25.1