4 files changed, 28 insertions, 60 deletions
diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index c2b8439df3..f0afcdb5ae 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -111,6 +111,18 @@ class TemplateDigestorTest < ActionView::TestCase
     end
   end
 
+  def test_logging_of_missing_template_for_dependencies
+    assert_logged "'messages/something_missing' file doesn't exist, so no dependencies" do
+      dependencies("messages/something_missing")
+    end
+  end
+
+  def test_logging_of_missing_template_for_nested_dependencies
+    assert_logged "'messages/something_missing' file doesn't exist, so no dependencies" do
+      nested_dependencies("messages/something_missing")
+    end
+  end
+
   def test_nested_template_directory
     assert_digest_difference("messages/show") do
       change_template("messages/actions/_move")
@@ -298,6 +310,14 @@ class TemplateDigestorTest < ActionView::TestCase
       ActionView::Digestor.digest({ name: template_name, finder: finder }.merge(options))
     end
 
+    def dependencies(template_name)
+      ActionView::Digestor.new({ name: template_name, finder: finder }).dependencies
+    end
+
+    def nested_dependencies(template_name)
+      ActionView::Digestor.new({ name: template_name, finder: finder }).nested_dependencies
+    end
+
     def finder
       @finder ||= FixtureFinder.new
     end
diff --git a/actionview/test/template/form_options_helper_test.rb b/actionview/test/template/form_options_helper_test.rb
index d25fa3706f..d7daba8bf3 100644
--- a/actionview/test/template/form_options_helper_test.rb
+++ b/actionview/test/template/form_options_helper_test.rb
@@ -645,6 +645,13 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_include_blank_false_and_required
+    @post = Post.new
+    @post.category = "<mus>"
+    e = assert_raises(ArgumentError) { select("post", "category", %w( abe <mus> hest), { include_blank: false }, required: 'required') }
+    assert_match(/include_blank cannot be false for a required field./, e.message)
+  end
+
   def test_select_with_blank_as_string
     @post = Post.new
     @post.category = "<mus>"
diff --git a/actionview/test/template/record_tag_helper_test.rb b/actionview/test/template/record_tag_helper_test.rb
index 4b7b653916..bfc5d04bed 100644
--- a/actionview/test/template/record_tag_helper_test.rb
+++ b/actionview/test/template/record_tag_helper_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class RecordTagPost
   extend ActiveModel::Naming
-  include ActiveModel::Conversion
+
   attr_accessor :id, :body
 
   def initialize
@@ -14,7 +14,6 @@ class RecordTagPost
 end
 
 class RecordTagHelperTest < ActionView::TestCase
-  include RenderERBUtils
 
   tests ActionView::Helpers::RecordTagHelper
 
diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb
index c6cc47fb4f..05c3dc0613 100644
--- a/actionview/test/template/test_case_test.rb
+++ b/actionview/test/template/test_case_test.rb
@@ -306,64 +306,6 @@ module ActionView
     end
   end
 
-  class RenderTemplateTest < ActionView::TestCase
-    test "supports specifying templates with a Regexp" do
-      controller.controller_path = "fun"
-      render(:template => "fun/games/hello_world")
-      assert_template %r{\Afun/games/hello_world\Z}
-    end
-
-    test "supports specifying partials" do
-      controller.controller_path = "test"
-      render(:template => "test/calling_partial_with_layout")
-      assert_template :partial => "_partial_for_use_in_layout"
-    end
-
-    test "supports specifying locals (passing)" do
-      controller.controller_path = "test"
-      render(:template => "test/calling_partial_with_layout")
-      assert_template :partial => "_partial_for_use_in_layout", :locals => { :name => "David" }
-    end
-
-    test "supports specifying locals (failing)" do
-      controller.controller_path = "test"
-      render(:template => "test/calling_partial_with_layout")
-      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
-      controller.controller_path = "test"
-      render(:template => "test/render_two_partials")
-      assert_template partial: '_partial', locals: { 'first' => '1' }
-      assert_template partial: '_partial', locals: { 'second' => '2' }
-    end
-
-    test 'raises descriptive error message when template was not rendered' do
-      controller.controller_path = "test"
-      render(template: "test/hello_world_with_partial")
-      e = assert_raise ActiveSupport::TestCase::Assertion do
-        assert_template partial: 'i_was_never_rendered', locals: { 'did_not' => 'happen' }
-      end
-      assert_match "i_was_never_rendered to be rendered but it was not.", e.message
-      assert_match 'Expected ["/test/partial"] to include "i_was_never_rendered"', e.message
-    end
-
-    test 'specifying locals works when the partial is inside a directory with underline prefix' do
-      controller.controller_path = "test"
-      render(template: 'test/render_partial_inside_directory')
-      assert_template partial: 'test/_directory/_partial_with_locales', locals: { 'name' => 'Jane' }
-    end
-
-    test 'specifying locals works when the partial is inside a directory without underline prefix' do
-      controller.controller_path = "test"
-      render(template: 'test/render_partial_inside_directory')
-      assert_template partial: 'test/_directory/partial_with_locales', locals: { 'name' => 'Jane' }
-    end
-  end
-
   module AHelperWithInitialize
     def initialize(*)
       super