From 5755bed4e1c29aed2e06c82146c6e7a12d57eb24 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 18 Sep 2019 01:25:47 +0000
Subject: [PATCH] Change textfield to textarea for "Exclude attachments by
 name" (#19903).

Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18476 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/_mail_handler.html.erb | 2 +-
 test/unit/mail_handler_test.rb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 910270033..3b2bb8049 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -10,7 +10,7 @@
     <em class="info"><%= l(:text_line_separated) %></em>
   </p>
   <p>
-    <%= setting_text_field :mail_handler_excluded_filenames, :size => 60 %>
+    <%= setting_text_area :mail_handler_excluded_filenames %>
     <label class="block">
       <%= setting_check_box :mail_handler_enable_regex_excluded_filenames, :label => false %>
       <%= l(:setting_mail_handler_enable_regex) %>
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 758f5f6e8..c2d97811d 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -1116,7 +1116,7 @@ class MailHandlerTest < ActiveSupport::TestCase
   end
 
   def test_attachments_that_match_mail_handler_excluded_filenames_should_be_ignored
-    with_settings :mail_handler_excluded_filenames => '*.vcf, *.jpg' do
+    with_settings :mail_handler_excluded_filenames => "*.vcf,\n *.jpg" do
       issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
       assert issue.is_a?(Issue)
       assert !issue.new_record?
-- 
2.39.5