From a6bcb86ab730de618a14cb5f373ec8955802776f Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Tue, 2 Jun 2015 10:19:32 +0200 Subject: [PATCH] Bug 12802: Fix tests in Letters.t --- t/db_dependent/Letters.t | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t index 22e279f7aa..702c8f1b76 100644 --- a/t/db_dependent/Letters.t +++ b/t/db_dependent/Letters.t @@ -528,19 +528,19 @@ is( scalar( @$messages ), 1, 'The message has been queued for the expected patro is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=OFF, EnqueueLetter used the patron email address if no to_address is given in parameter' ); $dbh->do(q|DELETE FROM message_queue|); -t::lib::Mocks::mock_preference('AutoEmailPrimaryAddress', 'email|OFF|emailpro'); # This is no consistent. OFF should be alone. +t::lib::Mocks::mock_preference('AutoEmailPrimaryAddress', 'email,OFF,emailpro'); # This is no consistent. OFF should be alone. is( C4::Letters::EnqueueLetter($my_message), 1, 'message successfully queued' ); $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); is( scalar( @$messages ), 1, 'The message has been queued for the expected patron' ); -is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email|OFF|emailpro, EnqueueLetter used the patron email address if no to_address is given in parameter' ); +is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email,OFF,emailpro, EnqueueLetter used the patron email address if no to_address is given in parameter' ); $dbh->do(q|DELETE FROM message_queue|); -t::lib::Mocks::mock_preference('AutoEmailPrimaryAddress', 'email|emailpro'); +t::lib::Mocks::mock_preference('AutoEmailPrimaryAddress', 'email,emailpro'); is( C4::Letters::EnqueueLetter($my_message), 2, 'messages successfully queued' ); $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); is( scalar( @$messages ), 2, 'The messages have been queued for the expected patron' ); -is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email|emailpro, EnqueueLetter used the patron email address for the first letter' ); -is( $messages->[1]{to_address}, $emailpro, 'AutoEmailPrimaryAddress=email|emailpro, EnqueueLetter used the patron emailpro address for the second letter' ); +is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email,emailpro, EnqueueLetter used the patron email address for the first letter' ); +is( $messages->[1]{to_address}, $emailpro, 'AutoEmailPrimaryAddress=email,emailpro, EnqueueLetter used the patron emailpro address for the second letter' ); { use C4::Serials; -- 2.11.0