From 507d5325e30e800a6f164bd909bb835012e578f2 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 4 Sep 2025 14:46:21 +0000 Subject: [PATCH] Bug 9762: (follow-up) Mock the user branch in NoIssuesChargeGuarantees.t and dateexpiry.t tests Without the patch: t/db_dependent/Circulation/NoIssuesChargeGuarantees.t fails t/db_dependent/Circulation/dateexpiry.t fails With the patch: t/db_dependent/Circulation/NoIssuesChargeGuarantees.t passes t/db_dependent/Circulation/dateexpiry.t passes --- C4/Circulation.pm | 5 +++-- t/db_dependent/Circulation/NoIssuesChargeGuarantees.t | 8 +++++++- t/db_dependent/Circulation/dateexpiry.t | 9 +++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index cc36501f7f4..a03953b56e1 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1417,8 +1417,9 @@ sub CanBookBeIssued { } my $borrower = $patron; - my $user = C4::Context->userenv->{number}; - my $branchcode = C4::Context->userenv->{branch}; + my $userenv = C4::Context->userenv; + my $user = $userenv ? $userenv->{number} : undef; + my $branchcode = $userenv ? $userenv->{branch} : undef; # action, cardnumber, barcode, date, heure, user, branche if ($issueconfirmed) { diff --git a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t index f8ed66d0c31..d3fe9815f95 100755 --- a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t +++ b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t @@ -34,7 +34,13 @@ $schema->storage->txn_begin; my $builder = t::lib::TestBuilder->new(); -my $item = $builder->build_sample_item; +my $item = $builder->build_sample_item; +my $library = $builder->build_object( { class => 'Koha::Libraries' } ); +t::lib::Mocks::mock_userenv( + { + branchcode => $library->branchcode, + } +); my $patron_category = $builder->build( { diff --git a/t/db_dependent/Circulation/dateexpiry.t b/t/db_dependent/Circulation/dateexpiry.t index 8eb52d443dc..b52a711746d 100755 --- a/t/db_dependent/Circulation/dateexpiry.t +++ b/t/db_dependent/Circulation/dateexpiry.t @@ -45,6 +45,15 @@ subtest 'Tests for CalcDateDue related to dateexpiry' => sub { }; sub can_book_be_issued { + + #mock the user branch + my $library = $builder->build_object( { class => 'Koha::Libraries' } ); + t::lib::Mocks::mock_userenv( + { + branchcode => $library->branchcode, + } + ); + my $item = $builder->build_sample_item; my $patron = $builder->build_object( { -- 2.39.5