From c267c5144107f96d6e61d7f32e657cc9bf39144c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 12 Apr 2017 11:10:57 -0300 Subject: [PATCH] Bug 18420: Fix Members.t when no patron category 'S' exists MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 No need to create Staff users here. Test plan: prove t/db_dependent/Members.t should return green, even if no categories.categorycode 'S' exists Signed-off-by: Marc VĂ©ron Signed-off-by: Marcel de Rooy --- t/db_dependent/Members.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t index 8520777..080c969 100755 --- a/t/db_dependent/Members.t +++ b/t/db_dependent/Members.t @@ -47,10 +47,10 @@ my $library1 = $builder->build({ my $library2 = $builder->build({ source => 'Branch', }); +my $patron_category = $builder->build({ source => 'Category' }); my $CARDNUMBER = 'TESTCARD01'; my $FIRSTNAME = 'Marie'; my $SURNAME = 'Mcknight'; -my $CATEGORYCODE = 'S'; my $BRANCHCODE = $library1->{branchcode}; my $CHANGED_FIRSTNAME = "Marry Ann"; @@ -85,7 +85,7 @@ my %data = ( cardnumber => $CARDNUMBER, firstname => $FIRSTNAME, surname => $SURNAME, - categorycode => $CATEGORYCODE, + categorycode => $patron_category->{categorycode}, branchcode => $BRANCHCODE, dateofbirth => '', dateexpiry => '9999-12-31', @@ -100,7 +100,7 @@ my $member = GetMember( cardnumber => $CARDNUMBER ) ok ( $member->{firstname} eq $FIRSTNAME && $member->{surname} eq $SURNAME && - $member->{categorycode} eq $CATEGORYCODE && + $member->{categorycode} eq $patron_category->{categorycode} && $member->{branchcode} eq $BRANCHCODE , "Got member") or diag("Mismatching member details: ".Dumper(\%data, $member)); @@ -154,7 +154,7 @@ is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when cardnumber => "123456789", firstname => "Tomasito", surname => "None", - categorycode => "S", + categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode}, dateofbirth => '', debarred => '', @@ -367,10 +367,10 @@ isnt( Koha::Patrons->find( $patron2->{borrowernumber} )->lastseen, undef, 'Lasts ## Remove all entries with userid='' (should be only 1 max) $dbh->do(q|DELETE FROM borrowers WHERE userid = ''|); ## And create a patron with a userid='' -$borrowernumber = AddMember( categorycode => 'S', branchcode => $library2->{branchcode} ); +$borrowernumber = AddMember( categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} ); $dbh->do(q|UPDATE borrowers SET userid = '' WHERE borrowernumber = ?|, undef, $borrowernumber); # Create another patron and verify the userid has been generated -$borrowernumber = AddMember( categorycode => 'S', branchcode => $library2->{branchcode} ); +$borrowernumber = AddMember( categorycode => $patron_category->{categorycode}, branchcode => $library2->{branchcode} ); ok( $borrowernumber > 0, 'AddMember should have inserted the patron even if no userid is given' ); $borrower = GetMember( borrowernumber => $borrowernumber ); ok( $borrower->{userid}, 'A userid should have been generated correctly' ); -- 2.1.4