From ddf860f1f86faa0c402b5260f83839f901c5a922 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 16 Jan 2017 14:44:46 -0500 Subject: [PATCH] Bug 17917: Fix Jenkins for t/db_dependent/Holds.t This changes AddMember into TestBuilder calls. TEST PLAN --------- 1) prove -v t/db_dependent/Holds.t -- fails 2) apply this patch 3) prove -v t/db_dependent/Holds.t -- works 4) run koha qa test tools --- C4/Members.pm | 3 +-- t/db_dependent/Holds.t | 18 +++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index f75c121..e7609e5 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -499,8 +499,7 @@ sub AddMember { if ( C4::Context->preference("autoMemberNum") ) { if ( not exists $data{cardnumber} or not defined $data{cardnumber} or $data{cardnumber} eq '' ) { - my $user_branch = C4::Context->userenv ? C4::Context->userenv->{'branch'} : q{}; - $data{cardnumber} = fixup_cardnumber( $data{cardnumber}, $user_branch, $data{categorycode} ); + $data{cardnumber} = fixup_cardnumber( $data{cardnumber}, C4::Context->userenv->{'branch'}, $data{categorycode} ); } } diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index 61b9e6e..e816322 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -55,13 +55,17 @@ my ($item_bibnum, $item_bibitemnum, $itemnumber) # Create some borrowers my @borrowernumbers; -foreach (1..$borrowers_count) { - my $borrowernumber = AddMember( - firstname => 'my firstname', - surname => 'my surname ' . $_, - categorycode => $category->{categorycode}, - branchcode => $branch_1, - ); +foreach my $count (1..$borrowers_count) { + my $patron = $builder->build({ + source => 'Borrower', + value => { + firstname => 'my firstname', + surname => 'my surname ' . $count, + categorycode => $category->{categorycode}, + branchcode => $branch_1, + }, + }); + my $borrowernumber = $patron->{borrowernumber}; push @borrowernumbers, $borrowernumber; } -- 2.1.4