Allow spaces between the keyword and colon in incoming mail. (#3731)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2837 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d7d72c43c8
commit
9886827a66
|
@ -224,7 +224,7 @@ class MailHandler < ActionMailer::Base
|
||||||
@keywords[attr]
|
@keywords[attr]
|
||||||
else
|
else
|
||||||
@keywords[attr] = begin
|
@keywords[attr] = begin
|
||||||
if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}:[ \t]*(.+)\s*$/i, '')
|
if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}[ \t]*:[ \t]*(.+)\s*$/i, '')
|
||||||
$1.strip
|
$1.strip
|
||||||
elsif !@@handler_options[:issue][attr].blank?
|
elsif !@@handler_options[:issue][attr].blank?
|
||||||
@@handler_options[:issue][attr]
|
@@handler_options[:issue][attr]
|
||||||
|
|
|
@ -95,6 +95,21 @@ class MailHandlerTest < Test::Unit::TestCase
|
||||||
assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
|
assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_add_issue_with_spaces_between_attribute_and_separator
|
||||||
|
issue = submit_email('ticket_with_spaces_between_attribute_and_separator.eml', :allow_override => 'tracker,category,priority')
|
||||||
|
assert issue.is_a?(Issue)
|
||||||
|
assert !issue.new_record?
|
||||||
|
issue.reload
|
||||||
|
assert_equal 'New ticket on a given project', issue.subject
|
||||||
|
assert_equal User.find_by_login('jsmith'), issue.author
|
||||||
|
assert_equal Project.find(2), issue.project
|
||||||
|
assert_equal 'Feature request', issue.tracker.to_s
|
||||||
|
assert_equal 'Stock management', issue.category.to_s
|
||||||
|
assert_equal 'Urgent', issue.priority.to_s
|
||||||
|
assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
def test_add_issue_with_attachment_to_specific_project
|
def test_add_issue_with_attachment_to_specific_project
|
||||||
issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
|
issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
|
||||||
assert issue.is_a?(Issue)
|
assert issue.is_a?(Issue)
|
||||||
|
|
Loading…
Reference in New Issue