From 57aedf1e8a6b0c0cbcdc3ae150bb4b25327dd367 Mon Sep 17 00:00:00 2001
From: harada <harada@example.com>
Date: Wed, 27 Mar 2019 14:19:04 +0900
Subject: [PATCH 3/3] Add tests.

---
 .../wiki_formatting/textile_formatter_test.rb |  3 ++-
 test/unit/mailer_test.rb                      | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
index 1c4bbf2bc..416894d8b 100644
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -165,7 +165,8 @@ EXPECTED
 
   def test_escaping
     assert_html_output(
-      'this is a <script>'      => 'this is a &lt;script&gt;'
+      'this is a <script>'      => 'this is a &lt;script&gt;',
+      'this is a <ＴＥＳＴ>'    => 'this is a &lt;ＴＥＳＴ&gt;',
     )
   end
 
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 51fc001f9..2b207d1ea 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -317,6 +317,32 @@ class MailerTest < ActiveSupport::TestCase
     end
   end
 
+  def test_issue_add_enclosed_in_lt_and_gt
+    issue = Issue.find(2)
+    issue.update(:description => 'aaa<bbb>ccc ＡＡＡ<ＢＢＢ>ＣＣＣ')
+    assert Mailer.deliver_issue_add(issue)
+
+    # text part
+    assert_mail_body_match 'aaa<bbb>ccc ＡＡＡ<ＢＢＢ>ＣＣＣ', last_email
+    # html part
+    assert_select_email do
+      assert_select 'p', :text => 'aaa<bbb>ccc ＡＡＡ<ＢＢＢ>ＣＣＣ'
+    end
+  end
+
+  def test_issue_edit_enclosed_in_lt_and_gt
+    journal = Journal.find(3)
+    journal.update(:notes => 'ddd<eee>fff ＤＤＤ<ＥＥＥ>ＦＦＦ')
+    assert Mailer.deliver_issue_edit(journal)
+
+    # text part
+    assert_mail_body_match 'ddd<eee>fff ＤＤＤ<ＥＥＥ>ＦＦＦ', last_email
+    # html part
+    assert_select_email do
+      assert_select 'p', :text => 'ddd<eee>fff ＤＤＤ<ＥＥＥ>ＦＦＦ'
+    end
+  end
+
   def test_message_posted_message_id
     message = Message.find(1)
     Mailer.deliver_message_posted(message)
-- 
2.21.0