1 files changed, 20 insertions, 4 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index e359f47975..9b4c419807 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -538,6 +538,22 @@ class UrlHelperTest < ActiveSupport::TestCase
     assert mail_to("david@loudthinking.com").html_safe?
   end
 
+  def test_mail_to_with_block
+    assert_dom_equal %{<a href="mailto:me@example.com"><span>Email me</span></a>},
+      mail_to('me@example.com') { content_tag(:span, 'Email me') }
+  end
+
+  def test_mail_to_with_block_and_options
+    assert_dom_equal %{<a class="special" href="mailto:me@example.com?cc=ccaddress%40example.com"><span>Email me</span></a>},
+      mail_to('me@example.com', cc: "ccaddress@example.com", class: "special") { content_tag(:span, 'Email me') }
+  end
+
+  def test_mail_to_does_not_modify_html_options_hash
+    options = { class: 'special' }
+    mail_to 'me@example.com', 'ME!', options
+    assert_equal({ class: 'special' }, options)
+  end
+
   def protect_against_forgery?
     self.request_forgery
   end
@@ -596,7 +612,7 @@ class UrlHelperControllerTest < ActionController::TestCase
       render inline: "<%= url_for controller: 'url_helper_controller_test/url_helper', action: 'show_url_for' %>"
     end
 
-    def show_overriden_url_for
+    def show_overridden_url_for
       render inline: "<%= url_for params.merge(controller: 'url_helper_controller_test/url_helper', action: 'show_url_for') %>"
     end
 
@@ -633,8 +649,8 @@ class UrlHelperControllerTest < ActionController::TestCase
     assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
   end
 
-  def test_overriden_url_for_shows_only_path
-    get :show_overriden_url_for
+  def test_overridden_url_for_shows_only_path
+    get :show_overridden_url_for
     assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
   end
 
@@ -684,7 +700,7 @@ class UrlHelperControllerTest < ActionController::TestCase
     assert_equal 'ok', @response.body
   end
 
-  def test_url_helper_can_be_overriden
+  def test_url_helper_can_be_overridden
     get :override_url_helper
     assert_equal '/url_helper_controller_test/url_helper/override_url_helper/override', @response.body
   end