From 2618d071320e4f7b16a70571c294c214c7681c0d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 22 Jul 2025 17:16:15 +0000 Subject: [PATCH] Bug 22632: (follow-up) QA tool corrections for Log.t Signed-off-by: Andrew Fuerste Henry --- t/db_dependent/Koha/Patron/Log.t | 90 +++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 26 deletions(-) mode change 100644 => 100755 t/db_dependent/Koha/Patron/Log.t diff --git a/t/db_dependent/Koha/Patron/Log.t b/t/db_dependent/Koha/Patron/Log.t old mode 100644 new mode 100755 index 02ff9602eee..b18ec4f3f17 --- a/t/db_dependent/Koha/Patron/Log.t +++ b/t/db_dependent/Koha/Patron/Log.t @@ -16,7 +16,7 @@ use Modern::Perl; use Test::More tests => 1; -use C4::Log; +use Koha::ActionLogs; use t::lib::Mocks; use t::lib::TestBuilder; @@ -29,48 +29,86 @@ subtest 'Test Koha::Patrons::merge' => sub { plan tests => 4; my $builder = t::lib::TestBuilder->new; - my $keeper = $builder->build_object({ class => 'Koha::Patrons' }); + my $keeper = $builder->build_object( { class => 'Koha::Patrons' } ); - my $borrower1 = $builder->build({source => 'Borrower'}); - my $borrower2 = $builder->build({source => 'Borrower'}); - my $borrower3 = $builder->build({source => 'Borrower'}); - my $borrower4 = $builder->build({source => 'Borrower'}); + my $borrower1 = $builder->build( { source => 'Borrower' } ); + my $borrower2 = $builder->build( { source => 'Borrower' } ); + my $borrower3 = $builder->build( { source => 'Borrower' } ); + my $borrower4 = $builder->build( { source => 'Borrower' } ); #test with BorrowersLog on - t::lib::Mocks::mock_preference('BorrowersLog', 1); - - my $results = $keeper->merge_with([ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ]); - - my $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,""); - - my $info_borrower1 = $borrower1->{firstname} . " " . $borrower1->{surname} . " (" . $borrower1->{cardnumber} . ") has been merged into " . - $keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")"; + t::lib::Mocks::mock_preference( 'BorrowersLog', 1 ); + + my $results = $keeper->merge_with( [ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ] ); + + my $log = Koha::ActionLogs->search( + { + module => 'MEMBERS', + action => 'PATRON_MERGE', + object => $keeper->id + }, + { order_by => { -desc => "timestamp" } } + )->unblessed; + + my $info_borrower1 = + $borrower1->{firstname} . " " + . $borrower1->{surname} . " (" + . $borrower1->{cardnumber} + . ") has been merged into " + . $keeper->firstname . " " + . $keeper->surname . " (" + . $keeper->cardnumber . ")"; my $info_log = $log->[0]{info}; - is($info_log,$info_borrower1,"GetLogs returns results in the log viewer for the merge of " . $borrower1->{borrowernumber}); - - my $info_borrower2 = $borrower2->{firstname} . " " . $borrower2->{surname} . " (" . $borrower2->{cardnumber} . ") has been merged into " . - $keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")"; + is( + $info_log, $info_borrower1, + "GetLogs returns results in the log viewer for the merge of " . $borrower1->{borrowernumber} + ); + + my $info_borrower2 = + $borrower2->{firstname} . " " + . $borrower2->{surname} . " (" + . $borrower2->{cardnumber} + . ") has been merged into " + . $keeper->firstname . " " + . $keeper->surname . " (" + . $keeper->cardnumber . ")"; $info_log = $log->[1]{info}; - is($info_log,$info_borrower2,"GetLogs returns results in the log viewer for the merge of " . $borrower2->{borrowernumber}); - + is( + $info_log, $info_borrower2, + "GetLogs returns results in the log viewer for the merge of " . $borrower2->{borrowernumber} + ); #test with BorrowersLog off - t::lib::Mocks::mock_preference('BorrowersLog', 0); + t::lib::Mocks::mock_preference( 'BorrowersLog', 0 ); + + $keeper = $builder->build_object( { class => 'Koha::Patrons' } ); - $keeper = $builder->build_object({ class => 'Koha::Patrons' }); + $results = $keeper->merge_with( [ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ] ); - $results = $keeper->merge_with([ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ]); + $log = Koha::ActionLogs->search( + { + module => 'MEMBERS', + action => 'PATRON_MERGE', + object => $keeper->id + }, + { order_by => { -desc => "timestamp" } } + )->unblessed; - $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,""); $info_log = $log->[0]{info}; - is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber}); + is( + $info_log, undef, + "GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber} + ); $info_log = $log->[1]{info}; - is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber}); + is( + $info_log, undef, + "GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber} + ); }; $schema->storage->txn_rollback; -- 2.39.5