From a658db8f7e8d94b463bc6f064753f4ad2aaa48e9 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 15 Jul 2020 02:26:20 -0300 Subject: [PATCH] Bug 21468: (QA follow-up) Enhance tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- .../Koha/Plugins/Circulation_hooks.t | 5 ++-- t/lib/Koha/Plugin/Test.pm | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Koha/Plugins/Circulation_hooks.t b/t/db_dependent/Koha/Plugins/Circulation_hooks.t index 97bee3d346..6dcf0efb60 100755 --- a/t/db_dependent/Koha/Plugins/Circulation_hooks.t +++ b/t/db_dependent/Koha/Plugins/Circulation_hooks.t @@ -22,7 +22,7 @@ use Test::Warn; use File::Basename; -use C4::Circulation qw(AddIssue AddRenewal); +use C4::Circulation qw(AddIssue AddRenewal AddReturn); use t::lib::Mocks; use t::lib::TestBuilder; @@ -92,8 +92,7 @@ subtest 'after_circ_action() hook tests' => sub { plan tests => 1; warning_like { - AddReturn( $patron->borrowernumber, $item->id, - $patron->branchcode ); + AddReturn( $item->barcode, $patron->branchcode ); } qr/after_circ_action called with action: checkin, ref: DateTime/, 'AddReturn calls the after_circ_action hook'; diff --git a/t/lib/Koha/Plugin/Test.pm b/t/lib/Koha/Plugin/Test.pm index 5125f71565..3638fe2198 100644 --- a/t/lib/Koha/Plugin/Test.pm +++ b/t/lib/Koha/Plugin/Test.pm @@ -165,8 +165,27 @@ sub after_circ_action { my $action = $params->{action}; my $checkout = $params->{payload}->{checkout}; - - Koha::Exceptions::Exception->throw("after_circ_action called with action: $action, ref: " . ref($checkout)); + my $payload = $params->{payload}; + + my $renewal_library_id = $payload->{renewal_library_id}; + my $charge = $payload->{charge}; + my $item_id = $payload->{item_id}; + my $item_type = $payload->{item_type}; + my $shelving_location = $payload->{shelving_location}; + my $patron_id = $payload->{patron_id}; + my $collection_code = $payload->{collection_code}; + my $date_due = $payload->{date_due}; + my $date_returned = $payload->{date_returned}; + + if ( $action eq 'renewal' ) { + Koha::Exceptions::Exception->throw("after_circ_action called with action: $action, ref: " . ref($checkout)); + } + elsif ( $action eq 'checkout') { + Koha::Exceptions::Exception->throw("after_circ_action called with action: $action, ref: " . ref($date_due)); + } + elsif ( $action eq 'checkin' ) { + Koha::Exceptions::Exception->throw("after_circ_action called with action: $action, ref: " . ref($date_returned)); + } } sub api_routes { -- 2.39.5