From e98b5d39a64ee70d167bb2130551cf45b1e6cdac Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Wed, 19 Aug 2020 10:51:49 -0400
Subject: [PATCH] Bug 22343: (QA follow-up) Fix unit tests

---
 t/Koha/Email.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/Koha/Email.t b/t/Koha/Email.t
index d7dfef1b6f..746872e672 100644
--- a/t/Koha/Email.t
+++ b/t/Koha/Email.t
@@ -25,7 +25,7 @@ use_ok('Koha::Email');
 
 subtest 'create() tests' => sub {
 
-    plan tests => 23;
+    plan tests => 21;
 
     t::lib::Mocks::mock_preference( 'SendAllEmailsTo', undef );
 
@@ -56,7 +56,7 @@ subtest 'create() tests' => sub {
     is( $email->email->header('X-Mailer'), 'Koha', 'Value set correctly' );
     is( $email->email->body, $html_body, "Body set correctly" );
     like( $email->email->content_type, qr|text/html|, "Content type set correctly");
-    like( $email->email->content_type, qr|charset="iso-8859-1"|, "Charset set correctly");
+    like( $email->email->content_type, qr|charset="?iso-8859-1"?|, "Charset set correctly");
     like( $email->email->header('Message-ID'), qr/\<.*@.*\>/, 'Value set correctly' );
 
     t::lib::Mocks::mock_preference( 'SendAllEmailsTo', 'catchall@example.com' );
@@ -81,5 +81,5 @@ subtest 'create() tests' => sub {
     is( $email->email->header('Sender'), 'returnpathdefault@example.com', 'ReturnpathDefault picked when sender not passed' );
     is( $email->email->body, $text_body, "Body set correctly" );
     like( $email->email->content_type, qr|text/plain|, "Content type set correctly");
-    like( $email->email->content_type, qr|charset="utf-8"|, "Charset set correctly");
+    like( $email->email->content_type, qr|charset="?utf-8"?|, "Charset set correctly");
 };
-- 
2.24.1 (Apple Git-126)