diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-24 07:10:53 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-24 07:10:53 -0700 |
| commit | dbdb1040760c3a3ce8c336dab59f0603975b28ec (patch) | |
| tree | e36ccdf08eab59574de2b45f78dfcc12abbf4acc /actionview | |
| parent | 199390f33713fae8ae29c441f8d233832ba5cc20 (diff) | |
| parent | fecbed6fb136a2f951633bd5b9632e75cc46f804 (diff) | |
| download | rails-dbdb1040760c3a3ce8c336dab59f0603975b28ec.tar.gz rails-dbdb1040760c3a3ce8c336dab59f0603975b28ec.tar.bz2 rails-dbdb1040760c3a3ce8c336dab59f0603975b28ec.zip | |
Merge pull request #18107 from mkdynamic/add-reply-to-mail-to
Add support for Reply-To field in mail_to helper
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/url_helper.rb | 5 | ||||
| -rw-r--r-- | actionview/test/template/url_helper_test.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index 364414da05..8c2d5705f1 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -428,6 +428,7 @@ module ActionView # * <tt>:body</tt> - Preset the body of the email. # * <tt>:cc</tt> - Carbon Copy additional recipients on the email. # * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email. + # * <tt>:reply_to</tt> - Preset the Reply-To field of the email. # # ==== Obfuscation # Prior to Rails 4.0, +mail_to+ provided options for encoding the address @@ -457,9 +458,9 @@ module ActionView html_options, name = name, nil if block_given? html_options = (html_options || {}).stringify_keys - extras = %w{ cc bcc body subject }.map! { |item| + extras = %w{ cc bcc body subject reply_to }.map! { |item| option = html_options.delete(item) || next - "#{item}=#{Rack::Utils.escape_path(option)}" + "#{item.dasherize}=#{Rack::Utils.escape_path(option)}" }.compact extras = extras.empty? ? '' : '?' + extras.join('&') diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb index e0678ae1f7..0d6f31af9b 100644 --- a/actionview/test/template/url_helper_test.rb +++ b/actionview/test/template/url_helper_test.rb @@ -493,8 +493,8 @@ class UrlHelperTest < ActiveSupport::TestCase def test_mail_with_options assert_dom_equal( - %{<a href="mailto:me@example.com?cc=ccaddress%40example.com&bcc=bccaddress%40example.com&body=This%20is%20the%20body%20of%20the%20message.&subject=This%20is%20an%20example%20email">My email</a>}, - mail_to("me@example.com", "My email", cc: "ccaddress@example.com", bcc: "bccaddress@example.com", subject: "This is an example email", body: "This is the body of the message.") + %{<a href="mailto:me@example.com?cc=ccaddress%40example.com&bcc=bccaddress%40example.com&body=This%20is%20the%20body%20of%20the%20message.&subject=This%20is%20an%20example%20email&reply-to=foo%40bar.com">My email</a>}, + mail_to("me@example.com", "My email", cc: "ccaddress@example.com", bcc: "bccaddress@example.com", subject: "This is an example email", body: "This is the body of the message.", reply_to: "foo@bar.com") ) end |