6 files changed, 16 insertions, 90 deletions
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index dac1c7024d..a15c6fac90 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -180,6 +180,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag("xml.png")) => %(<img alt="Xml" src="/images/xml.png" />),
     %(image_tag("rss.gif", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.gif" />),
     %(image_tag("gold.png", :size => "20")) => %(<img alt="Gold" height="20" src="/images/gold.png" width="20" />),
+    %(image_tag("gold.png", :size => 20)) => %(<img alt="Gold" height="20" src="/images/gold.png" width="20" />),
     %(image_tag("gold.png", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
     %(image_tag("gold.png", "size" => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
     %(image_tag("error.png", "size" => "45 x 70")) => %(<img alt="Error" src="/images/error.png" />),
@@ -238,6 +239,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(video_tag("gold.m4v", "size" => "320x240")) => %(<video height="240" src="/videos/gold.m4v" width="320"></video>),
     %(video_tag("trailer.ogg", :poster => "screenshot.png")) => %(<video poster="/images/screenshot.png" src="/videos/trailer.ogg"></video>),
     %(video_tag("error.avi", "size" => "100")) => %(<video height="100" src="/videos/error.avi" width="100"></video>),
+    %(video_tag("error.avi", "size" => 100)) => %(<video height="100" src="/videos/error.avi" width="100"></video>),
     %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi"></video>),
     %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi"></video>),
     %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov"></video>),
diff --git a/actionview/test/template/record_tag_helper_test.rb b/actionview/test/template/record_tag_helper_test.rb
index ab84bccb56..4b7b653916 100644
--- a/actionview/test/template/record_tag_helper_test.rb
+++ b/actionview/test/template/record_tag_helper_test.rb
@@ -24,94 +24,10 @@ class RecordTagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_for
-    expected = %(<li class="record_tag_post" id="record_tag_post_45"></li>)
-    actual = content_tag_for(:li, @post)
-    assert_dom_equal expected, actual
+    assert_raises(NoMethodError) { content_tag_for(:li, @post) }
   end
 
-  def test_content_tag_for_prefix
-    expected = %(<ul class="archived_record_tag_post" id="archived_record_tag_post_45"></ul>)
-    actual = content_tag_for(:ul, @post, :archived)
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_with_extra_html_options
-    expected = %(<tr class="record_tag_post special" id="record_tag_post_45" style='background-color: #f0f0f0'></tr>)
-    actual = content_tag_for(:tr, @post, class: "special", style: "background-color: #f0f0f0")
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_with_array_css_class
-    expected = %(<tr class="record_tag_post special odd" id="record_tag_post_45"></tr>)
-    actual = content_tag_for(:tr, @post, class: ["special", "odd"])
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_with_prefix_and_extra_html_options
-    expected = %(<tr class="archived_record_tag_post special" id="archived_record_tag_post_45" style='background-color: #f0f0f0'></tr>)
-    actual = content_tag_for(:tr, @post, :archived, class: "special", style: "background-color: #f0f0f0")
-    assert_dom_equal expected, actual
-  end
-
-  def test_block_not_in_erb_multiple_calls
-    expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
-    actual = div_for(@post, class: "special") { @post.body }
-    assert_dom_equal expected, actual
-    actual = div_for(@post, class: "special") { @post.body }
-    assert_dom_equal expected, actual
-  end
-
-  def test_block_works_with_content_tag_for_in_erb
-    expected = %(<tr class="record_tag_post" id="record_tag_post_45">What a wonderful world!</tr>)
-    actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
-    assert_dom_equal expected, actual
-  end
-
-  def test_div_for_in_erb
-    expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
-    actual = render_erb("<%= div_for(@post, class: 'special') do %><%= @post.body %><% end %>")
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_collection
-    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
-    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
-    expected = %(<li class="record_tag_post" id="record_tag_post_101">Hello!</li>\n<li class="record_tag_post" id="record_tag_post_102">World!</li>)
-    actual = content_tag_for(:li, [post_1, post_2]) { |post| post.body }
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_collection_without_given_block
-    post_1 = RecordTagPost.new.tap { |post| post.id = 101; post.body = "Hello!" }
-    post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!" }
-    expected = %(<li class="record_tag_post" id="record_tag_post_101"></li>\n<li class="record_tag_post" id="record_tag_post_102"></li>)
-    actual = content_tag_for(:li, [post_1, post_2])
-    assert_dom_equal expected, actual
-  end
-
-  def test_div_for_collection
-    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
-    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
-    expected = %(<div class="record_tag_post" id="record_tag_post_101">Hello!</div>\n<div class="record_tag_post" id="record_tag_post_102">World!</div>)
-    actual = div_for([post_1, post_2]) { |post| post.body }
-    assert_dom_equal expected, actual
-  end
-
-  def test_content_tag_for_single_record_is_html_safe
-    result = div_for(@post, class: "special") { @post.body }
-    assert result.html_safe?
-  end
-
-  def test_content_tag_for_collection_is_html_safe
-    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
-    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
-    result = content_tag_for(:li, [post_1, post_2]) { |post| post.body }
-    assert result.html_safe?
-  end
-
-  def test_content_tag_for_does_not_change_options_hash
-    options = { class: "important" }
-    content_tag_for(:li, @post, options)
-    assert_equal({ class: "important" }, options)
+  def test_div_for
+    assert_raises(NoMethodError) { div_for(@post, class: "special") }
   end
 end
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 691636a8f9..22665b6844 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -61,9 +61,10 @@ module RenderTestCases
 
   def test_render_template_with_a_missing_partial_of_another_format
     @view.lookup_context.formats = [:html]
-    assert_raise ActionView::Template::Error, "Missing partial /_missing with {:locale=>[:en], :formats=>[:json], :handlers=>[:erb, :builder]}" do
+    e = assert_raise ActionView::Template::Error do
       @view.render(:template => "with_format", :formats => [:json])
     end
+    assert_includes(e.message, "Missing partial /_missing with {:locale=>[:en], :formats=>[:json], :variants=>[], :handlers=>[:raw, :erb, :builder, :ruby]}.")
   end
 
   def test_render_file_with_locale
diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb
index c94508d678..aae6a9aa09 100644
--- a/actionview/test/template/template_test.rb
+++ b/actionview/test/template/template_test.rb
@@ -183,10 +183,11 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def test_error_when_template_isnt_valid_utf8
-    assert_raises(ActionView::Template::Error, /\xFC/) do
+    e = assert_raises ActionView::Template::Error do
       @template = new_template("hello \xFCmlat", :virtual_path => nil)
       render
     end
+    assert_match(/\xFC/, e.message)
   end
 
   def with_external_encoding(encoding)
diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb
index 5ad1938b61..c6cc47fb4f 100644
--- a/actionview/test/template/test_case_test.rb
+++ b/actionview/test/template/test_case_test.rb
@@ -328,9 +328,10 @@ module ActionView
     test "supports specifying locals (failing)" do
       controller.controller_path = "test"
       render(:template => "test/calling_partial_with_layout")
-      assert_raise ActiveSupport::TestCase::Assertion, /Somebody else.*David/m do
+      e = assert_raise ActiveSupport::TestCase::Assertion do
         assert_template :partial => "_partial_for_use_in_layout", :locals => { :name => "Somebody Else" }
       end
+      assert_match(/Somebody Else.*David/m, e.message)
     end
 
     test 'supports different locals on the same partial' do
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index ee3313489f..ef4df0407a 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -495,6 +495,11 @@ class UrlHelperTest < ActiveSupport::TestCase
       %{<a href="mailto:me@example.com?cc=ccaddress%40example.com&amp;bcc=bccaddress%40example.com&amp;body=This%20is%20the%20body%20of%20the%20message.&amp;subject=This%20is%20an%20example%20email&amp;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")
     )
+
+    assert_dom_equal(
+      %{<a href="mailto:me@example.com?body=This%20is%20the%20body%20of%20the%20message.&amp;subject=This%20is%20an%20example%20email">My email</a>},
+      mail_to("me@example.com", "My email", cc: '', bcc: '', subject: "This is an example email", body: "This is the body of the message.")
+    )
   end
 
   def test_mail_to_with_img