Bug 17486: [QA Follow-up] Changes as to set_userenv

Add shibboleth parameter to POD of set_userenv.
Removed a 12th set_userenv parameter from Borrower_Discharge.t.
Replaced set_userenv call in PatronLists.t looking like a fortunate typo.

Test plan:
Run the two corrected tests.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/C4/Context.pm b/C4/Context.pm
index b63b292..a50ddfd 100644 (file)
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -847,7 +847,7 @@ sub userenv {
   C4::Context->set_userenv($usernum, $userid, $usercnum,
                            $userfirstname, $usersurname,
                            $userbranch, $branchname, $userflags,
-                           $emailaddress, $branchprinter);
+                           $emailaddress, $branchprinter, $shibboleth);
 
 Establish a hash of user environment variables.
 

diff --git a/t/db_dependent/Patron/Borrower_Discharge.t b/t/db_dependent/Patron/Borrower_Discharge.t
index dbdd7af..88785bd 100644 (file)
--- a/t/db_dependent/Patron/Borrower_Discharge.t
+++ b/t/db_dependent/Patron/Borrower_Discharge.t
@@ -43,7 +43,7 @@ my $another_library = $builder->build({ source => 'Branch' });
 my $itemtype        = $builder->build({ source => 'Itemtype' })->{itemtype};
 
 C4::Context->_new_userenv('xxx');
-C4::Context->set_userenv(0, 0, 0, 'firstname', 'surname', $library->{branchcode}, $library->{branchcode}, '', '', '', '', '');
+C4::Context->set_userenv(0, 0, 0, 'firstname', 'surname', $library->{branchcode}, $library->{branchcode}, '', '', '', '');
 my $patron = $builder->build({
     source => 'Borrower',
     value => {

diff --git a/t/db_dependent/PatronLists.t b/t/db_dependent/PatronLists.t
index a5bb41a..e7f4f87 100755 (executable)
--- a/t/db_dependent/PatronLists.t
+++ b/t/db_dependent/PatronLists.t
@@ -30,7 +30,7 @@ $schema->storage->txn_begin;
 my $builder = t::lib::TestBuilder->new;
 
 C4::Context->_new_userenv('DUMMY SESSION');
-C4::Context->set_userenv(0,0,0,'firstname','surname', 'BRANCH1', 'Library 1', 0, ', ');
+C4::Context->set_userenv( 0 ); # Koha::List::Patron only needs a number
 
 # Create 10 sample borrowers
 my @borrowers = ();