From c86dad7cc71f0d293d6ed5a641c71b9d9fadbe08 Mon Sep 17 00:00:00 2001 From: mehdi Date: Mon, 25 Jul 2016 10:56:36 -0400 Subject: [PATCH] Bug 12532 - QA Follow-up Fixed tests, they now work without any fails https://bugs.koha-community.org/show_bug.cgi?id=12532 Signed-off-by: Marc pouet --- t/db_dependent/Letters.t | 21 ++++++++------------- t/db_dependent/Members.t | 12 ++++++------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t index bec56ef..79c96824 100755 --- a/t/db_dependent/Letters.t +++ b/t/db_dependent/Letters.t @@ -18,7 +18,7 @@ # along with Koha; if not, see . use Modern::Perl; -use Test::More tests => 74; +use Test::More tests => 79; use Test::MockModule; use Test::Warn; @@ -165,7 +165,7 @@ my $guarantee = { }; $guarantee->{'borrowernumber'} = AddMember(%$guarantee); -my $GUARANTEE_TO_ADDRESS = 'toto@exemple.com'; +my $GUARANTEE_TO_ADDRESS = 'guarantor@example.com'; my $guarantee_message = { borrowernumber => $guarantee->{'borrowernumber'}, message_transport_type => 'email', @@ -177,7 +177,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(); @@ -185,22 +185,17 @@ 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."); - -$guarantor->{'email'} = undef; -ModMember(%$guarantor); -$result = SendToGuarantor(1,$guarantee_message); -is($result->{'status'}, "failed", "With EnableRedirectGuaranteeEmail on, message fails if guarantor has no 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."); $guarantee->{'guarantorid'} = undef; ModMember(%$guarantee); $result = SendToGuarantor(1,$guarantee_message); -is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With EnableRedirectGuaranteeEmail on, Message is sent to specicied to_address if he has no guarantor."); +is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With RedirectGuaranteeEmail on, Message is sent to specicied to_address if he has no guarantor."); # GetLetters my $letters = C4::Letters::GetLetters(); diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t index 0b8a150..5a7b145 100755 --- a/t/db_dependent/Members.t +++ b/t/db_dependent/Members.t @@ -17,7 +17,7 @@ use Modern::Perl; -use Test::More tests => 84; +use Test::More tests => 85; use Test::MockModule; use Data::Dumper; use C4::Context; @@ -153,7 +153,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(); @@ -178,13 +178,13 @@ my $guarantee = { $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"); @@ -328,7 +328,7 @@ my $borrower2 = $builder->build({ }, }); -my $guarantee = $builder->build({ +$guarantee = $builder->build({ source => 'Borrower', value => { categorycode=>'KIDclamp', -- 1.9.1