From 64ee6f0b2bbcc9b23520c689146f1c5cf905e997 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 12 Nov 2020 13:36:00 +0000 Subject: [PATCH] Bug 26948: Regression tests We already mock the send_or_die method from Email::Stuffer; This patch updates that mock to extract the internal representation of the email encoded message and looks for a known double encoded representation of a character in the sample body. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- t/db_dependent/Letters.t | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t index 766e21d7f4..88dfec8b1d 100755 --- a/t/db_dependent/Letters.t +++ b/t/db_dependent/Letters.t @@ -18,12 +18,14 @@ # along with Koha; if not, see . use Modern::Perl; -use Test::More tests => 73; +use Test::More tests => 77; use Test::MockModule; use Test::Warn; use MARC::Record; +use utf8; + my ( $email_object, $sendmail_params ); my $email_sender_module = Test::MockModule->new('Email::Stuffer'); @@ -31,6 +33,8 @@ $email_sender_module->mock( 'send_or_die', sub { ( $email_object, $sendmail_params ) = @_; + my $str = $email_object->email->as_string; + unlike $str, qr/I =C3=A2=C2=99=C2=A5 Koha=/, "Content is not double encoded"; warn "Fake send_or_die"; } ); @@ -110,8 +114,8 @@ is( $message_id, undef, 'EnqueueLetter without the letter argument returns undef delete $my_message->{message_transport_type}; $my_message->{letter} = { - content => 'a message', - title => 'message title', + content => 'I ♥ Koha', + title => '啤酒 is great', metadata => 'metadata', code => 'TEST_MESSAGE', content_type => 'text/plain', @@ -534,7 +538,7 @@ is($email_object->email->header('To'), 'robert.tables@mail.com', "mailto address t::lib::Mocks::mock_preference( 'SendAllEmailsTo', '' ); subtest 'SendAlerts - claimissue' => sub { - plan tests => 9; + plan tests => 11; use C4::Serials; @@ -749,7 +753,7 @@ subtest 'TranslateNotices' => sub { subtest 'SendQueuedMessages' => sub { - plan tests => 9; + plan tests => 12; t::lib::Mocks::mock_preference( 'SMSSendDriver', 'Email' ); t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', ''); -- 2.39.5