From 7439bdab199527ebf356a351080191ed2fc58bcb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 2 Dec 2019 17:50:40 +0100 Subject: [PATCH] Bug 24145: (bug 22543 follow-up) Fix Auth.t Auth.t is failing because of: 1. recent changes from bug 22543 and 2. wrong mocked CGI->param in tests Without this patch we hit the exit statement that breaks the tests with the following error: t/db_dependent/Auth.t .. 1/22 Un-mocked method 'url()' called at /kohadevbox/koha/C4/Auth.pm line 1223. Un-mocked method 'redirect()' called at /kohadevbox/koha/C4/Auth.pm line 1227. A context appears to have been destroyed without first calling release(). Based on $@ it does not look like an exception was thrown (this is not always a reliable test) This is a problem because the global error variables ($!, $@, and $?) will not be restored. In addition some release callbacks will not work properly from inside a DESTROY method. Here are the context creation details, just in case a tool forgot to call release(): File: t/db_dependent/Auth.t Line: 74 Tool: Test::More::subtest Cleaning up the CONTEXT stack... # Looks like you planned 22 tests but ran 1. t/db_dependent/Auth.t .. Dubious, test returned 255 (wstat 65280, 0xff00) Failed 21/22 subtests Test Summary Report ------------------- t/db_dependent/Auth.t (Wstat: 65280 Tests: 1 Failed: 0) Non-zero exit status: 255 Parse errors: Bad plan. You planned 22 tests but ran 1. Files=1, Tests=1, 2 wallclock secs ( 0.02 usr 0.00 sys + 1.54 cusr 0.24 csys = 1.80 CPU) Result: FAIL Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 678b4bf4642852aba0d11af0ba826164ffdfd012) Signed-off-by: Hayley Mapley (cherry picked from commit f7851500a9f44a4e5f5096f3f74ec9dba9c6991c) --- t/db_dependent/Auth.t | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t index ef8ab9937c..5536573d17 100644 --- a/t/db_dependent/Auth.t +++ b/t/db_dependent/Auth.t @@ -39,11 +39,17 @@ subtest 'checkauth() tests' => sub { plan tests => 3; - my $patron = $builder->build({ source => 'Borrower', value => { flags => undef } })->{userid}; + my $patron = $builder->build_object({ class => 'Koha::Patrons', value => { flags => undef } }); # Mock a CGI object with real userid param my $cgi = Test::MockObject->new(); - $cgi->mock( 'param', sub { return $patron; } ); + $cgi->mock( + 'param', + sub { + my $var = shift; + if ( $var eq 'userid' ) { return $patron->userid; } + } + ); $cgi->mock( 'cookie', sub { return; } ); my $authnotrequired = 1; -- 2.39.5