From 1a7213beab66111cf4cf0e4578873c4538b83f4a Mon Sep 17 00:00:00 2001 From: Paudet Date: Wed, 5 Jul 2017 15:11:39 -0400 Subject: [PATCH] Bug 12532 - Bug 12532 - QA Follow-up Fixed tests, they now work without any fails. --- t/db_dependent/Letters.t | 24 ++++++++++++++---------- t/db_dependent/Members.t | 14 +++++++------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t index 1c3d951..3b8e5a1 100755 --- a/t/db_dependent/Letters.t +++ b/t/db_dependent/Letters.t @@ -152,24 +152,28 @@ $resent = C4::Letters::ResendMessage(); is( $resent, undef, 'ResendMessage should return undef if not message_id given' ); #Test guarantee-guarantor email redirection +$library = $builder->build({ + source => 'Branch', +}); my ($GUARANTEE_EMAIL, $GUARANTOR_EMAIL) = qw| guarantee@example.com guarantor@example.com |; +my $guarantor_category = $builder->build({ source => 'Category' }); my $guarantor = { email => $GUARANTOR_EMAIL, - categorycode => 'PT', - branchcode => 'CPL', + categorycode => categorycode => $guarantor_category, + branchcode => branchcode => $library->{branchcode}, surname => "Guarantor" }; $guarantor->{'borrowernumber'} = AddMember(%$guarantor); my $guarantee = { guarantorid => $guarantor->{'borrowernumber'}, email => $GUARANTEE_EMAIL, - categorycode => 'PT', - branchcode => 'CPL', + categorycode => categorycode => $guarantor_category, + branchcode => branchcode => $library->{branchcode},, surname => "Guarantee" }; $guarantee->{'borrowernumber'} = AddMember(%$guarantee); -my $GUARANTEE_TO_ADDRESS = 'toto@exemple.com'; +my $GUARANTEE_TO_ADDRESS = 'guarantor@exemple.com'; my $guarantee_message = { borrowernumber => $guarantee->{'borrowernumber'}, message_transport_type => 'email', @@ -181,7 +185,7 @@ my $guarantee_message = { sub SendToGuarantor { my ($useGuarantor, $message) = @_; C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' ); - C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', $useGuarantor ); + C4::Context->set_preference( 'RedirectGuaranteeEmail', $useGuarantor ); C4::Context->clear_syspref_cache(); my $id = C4::Letters::EnqueueLetter($message); C4::Letters::SendQueuedMessages(); @@ -189,12 +193,12 @@ sub SendToGuarantor { return $result; } my $result = SendToGuarantor(0,$guarantee_message); -is($result->{'status'}, "sent", "With EnableRedirectGuaranteeEmail off, message is sent."); -is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With EnableRedirectGuaranteeEmail off, Message is sent to the specified to_address."); +is($result->{'status'}, "sent", "With RedirectGuaranteeEmail off, message is sent."); +is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With RedirectGuaranteeEmail off, Message is sent to the specified to_address."); $result = SendToGuarantor(1,$guarantee_message); -is($result->{'status'}, "sent", "With EnableRedirectGuaranteeEmail on, message is sent."); -is($result->{'to_address'}, $GUARANTOR_EMAIL, "With EnableRedirectGuaranteeEmail on, Message is sent to the guarantor's email address."); +is($result->{'status'}, "sent", "With RedirectGuaranteeEmail on, message is sent."); +is($result->{'to_address'}, $GUARANTOR_EMAIL, "With RedirectGuaranteeEmail on, Message is sent to the guarantor's email address."); $guarantor->{'email'} = undef; ModMember(%$guarantor); diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t index 95f9124..2601825 100755 --- a/t/db_dependent/Members.t +++ b/t/db_dependent/Members.t @@ -17,7 +17,7 @@ use Modern::Perl; -use Test::More tests => 65; +use Test::More tests => 87; use Test::MockModule; use Data::Dumper qw/Dumper/; use C4::Context; @@ -139,7 +139,7 @@ is ($checkcardnum, "2", "Card number is too long"); t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' ); -C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', 0 ); +C4::Context->set_preference( 'RedirectGuaranteeEmail', 0 ); C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' ); C4::Context->clear_syspref_cache(); @@ -157,20 +157,20 @@ my $GUARANTEE_EMAIL = 'guanrantee@email.test'; my $guarantee = { guarantorid => $member->{'borrowernumber'}, emailpro => $GUARANTEE_EMAIL, - categorycode => $CATEGORYCODE, + categorycode => $member->{categorycode}, branchcode => $BRANCHCODE, surname => "surname" }; $guarantee->{'borrowernumber'} = AddMember(%$guarantee); $notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'}); -is ($notice_email, $GUARANTEE_EMAIL, "GetNoticeEmailAddress returns correct value when EnableRedirectGuaranteeEmail is disabled"); +is ($notice_email, $GUARANTEE_EMAIL, "GetNoticeEmailAddress returns correct value when RedirectGuaranteeEmail is disabled"); -C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', 1 ); +C4::Context->set_preference( 'RedirectGuaranteeEmail', 1 ); C4::Context->clear_syspref_cache(); $notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'}); -is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when EnableRedirectGuaranteeEmail is activated"); +is ($notice_email, "$GUARANTEE_EMAIL,$EMAILPRO", "GetNoticeEmailAddress returns correct value when RedirectGuaranteeEmail is activated"); ok(!$member->{is_expired}, "GetMemberDetails() indicates that patron is not expired"); @@ -316,7 +316,7 @@ my $borrower2 = $builder->build({ }, }); -my $guarantee = $builder->build({ +$guarantee = $builder->build({ source => 'Borrower', value => { categorycode=>'KIDclamp', -- 1.9.1