diff options
| -rwxr-xr-x | app/models/mail_handler.rb | 3 | ||||
| -rw-r--r-- | test/fixtures/mail_handler/ticket_on_given_project.eml | 1 | ||||
| -rw-r--r-- | test/unit/mail_handler_test.rb | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index c158435a9..7690dfa2b 100755 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -429,7 +429,8 @@ class MailHandler < ActionMailer::Base 'start_date' => get_keyword(:start_date, :format => '\d{4}-\d{2}-\d{2}'), 'due_date' => get_keyword(:due_date, :format => '\d{4}-\d{2}-\d{2}'), 'estimated_hours' => get_keyword(:estimated_hours), - 'done_ratio' => get_keyword(:done_ratio, :format => '(\d|10)?0') + 'done_ratio' => get_keyword(:done_ratio, :format => '(\d|10)?0'), + 'parent_issue_id' => get_keyword(:parent_issue) }.delete_if {|k, v| v.blank? } attrs diff --git a/test/fixtures/mail_handler/ticket_on_given_project.eml b/test/fixtures/mail_handler/ticket_on_given_project.eml index e311dfbb7..9cfab2a06 100644 --- a/test/fixtures/mail_handler/ticket_on_given_project.eml +++ b/test/fixtures/mail_handler/ticket_on_given_project.eml @@ -38,6 +38,7 @@ Assigned to: John Smith fixed version: alpha estimated hours: 2.5 done ratio: 30 +parent issue: 1 --- This line starts with a delimiter and should not be stripped diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index f2dc36495..62875b9a0 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -43,7 +43,7 @@ class MailHandlerTest < ActiveSupport::TestCase def test_add_issue_with_specific_overrides issue = submit_email('ticket_on_given_project.eml', :allow_override => ['status', 'start_date', 'due_date', 'assigned_to', - 'fixed_version', 'estimated_hours', 'done_ratio'] + 'fixed_version', 'estimated_hours', 'done_ratio', 'parent_issue'] ) assert issue.is_a?(Issue) assert !issue.new_record? @@ -60,6 +60,7 @@ class MailHandlerTest < ActiveSupport::TestCase assert_equal Version.find_by_name('Alpha'), issue.fixed_version assert_equal 2.5, issue.estimated_hours assert_equal 30, issue.done_ratio + assert_equal Issue.find(4), issue.parent # keywords should be removed from the email body assert !issue.description.match(/^Project:/i) assert !issue.description.match(/^Status:/i) @@ -81,6 +82,7 @@ class MailHandlerTest < ActiveSupport::TestCase assert_equal Version.find_by_name('Alpha'), issue.fixed_version assert_equal 2.5, issue.estimated_hours assert_equal 30, issue.done_ratio + assert_equal Issue.find(4), issue.parent end def test_add_issue_without_overrides_should_ignore_attributes @@ -102,6 +104,7 @@ class MailHandlerTest < ActiveSupport::TestCase assert_nil issue.fixed_version assert_nil issue.estimated_hours assert_equal 0, issue.done_ratio + assert_nil issue.parent end def test_add_issue_to_project_specified_by_subaddress @@ -474,6 +477,7 @@ class MailHandlerTest < ActiveSupport::TestCase assert_nil issue.start_date assert_nil issue.due_date assert_equal 0, issue.done_ratio + assert_nil issue.parent assert_equal 'Normal', issue.priority.to_s assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.') end |