12 files changed, 90 insertions, 11 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 9b0d4d0f4c..4ab5d92a2b 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 require 'controller/fake_controllers'
 
 class ActionPackAssertionsController < ActionController::Base
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b9513ccff4..9b42e7631f 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/logger'
+require 'controller/fake_models'
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
 # Provide some controller to run the tests on.
@@ -63,6 +64,10 @@ end
 class RecordIdentifierController < ActionController::Base
 end
 
+class RecordIdentifierWithoutDeprecationController < ActionController::Base
+  include ActionView::RecordIdentifier
+end
+
 class ControllerClassTests < ActiveSupport::TestCase
 
   def test_controller_path
@@ -81,6 +86,42 @@ class ControllerClassTests < ActiveSupport::TestCase
     assert_respond_to RecordIdentifierController.new, :dom_id
     assert_respond_to RecordIdentifierController.new, :dom_class
   end
+
+  def test_record_identifier_is_deprecated
+    record = Comment.new
+    record.save
+
+    dom_id = nil
+    assert_deprecated 'dom_id method will no longer' do
+      dom_id = RecordIdentifierController.new.dom_id(record)
+    end
+
+    assert_equal 'comment_1', dom_id
+
+    dom_class = nil
+    assert_deprecated 'dom_class method will no longer' do
+      dom_class = RecordIdentifierController.new.dom_class(record)
+    end
+    assert_equal 'comment', dom_class
+  end
+
+  def test_no_deprecation_when_action_view_record_identifier_is_included
+    record = Comment.new
+    record.save
+
+    dom_id = nil
+    assert_not_deprecated do
+      dom_id = RecordIdentifierWithoutDeprecationController.new.dom_id(record)
+    end
+
+    assert_equal 'comment_1', dom_id
+
+    dom_class = nil
+    assert_not_deprecated do
+      dom_class = RecordIdentifierWithoutDeprecationController.new.dom_class(record)
+    end
+    assert_equal 'comment', dom_class
+  end
 end
 
 class ControllerInstanceTests < ActiveSupport::TestCase
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index f18bf33969..cf561d913a 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 
 class SessionTest < ActiveSupport::TestCase
   StubApp = lambda { |env|
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index bfca8c5c24..f4bdd3e1d4 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -85,7 +85,7 @@ module RenderStreaming
 
     test "rendering with template exception logs the exception" do
       io = StringIO.new
-      _old, ActionController::Base.logger = ActionController::Base.logger, ActiveSupport::Logger.new(io)
+      _old, ActionView::Base.logger = ActionView::Base.logger, ActiveSupport::Logger.new(io)
 
       begin
         get "/render_streaming/basic/template_exception"
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index 5e302da212..1e80c8601c 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -5,7 +5,7 @@
 
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 
 class SelectorTest < ActiveSupport::TestCase
   #
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 6a44197525..25d85c47c7 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -65,7 +65,6 @@ class AssetTagHelperTest < ActionView::TestCase
     %(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss)) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
-    %(auto_discovery_link_tag(:xml)) => %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "//localhost/feed")) => %(<link href="//localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
@@ -299,6 +298,16 @@ class AssetTagHelperTest < ActionView::TestCase
     %(audio_tag(["audio.mp3", "audio.ogg"], :autobuffer => true, :controls => true)) => %(<audio autobuffer="autobuffer" controls="controls"><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>)
   }
 
+  def test_autodiscovery_link_tag_deprecated_types
+    result = nil
+    assert_deprecated do
+      result = auto_discovery_link_tag(:xml)
+    end
+
+    expected = %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />)
+    assert_equal expected, result
+  end
+
   def test_auto_discovery_link_tag
     AutoDiscoveryToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
diff --git a/actionpack/test/template/erb/helper.rb b/actionpack/test/template/erb/helper.rb
index 799f9e4036..a1973068d5 100644
--- a/actionpack/test/template/erb/helper.rb
+++ b/actionpack/test/template/erb/helper.rb
@@ -1,5 +1,6 @@
 module ERBTest
   class ViewContext
+    include ActionView::Helpers::UrlHelper
     include SharedTestRoutes.url_helpers
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::JavaScriptHelper
@@ -20,4 +21,4 @@ module ERBTest
       "<%= #{str} do %>#{rest}<% end %>"
     end
   end
-end
-\ No newline at end of file
+end
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 1713ce935c..7f4c84929f 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -8,9 +8,10 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
 
   def setup
     super
-    @controller = Object.new
-    @controller.stubs(:_prefixes).returns(%w(test))
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller)
+    view_paths = ActionController::Base.view_paths
+    lookup_context = ActionView::LookupContext.new(view_paths, {}, ["test"])
+    renderer = ActionView::Renderer.new(lookup_context)
+    @view = ActionView::Base.new(renderer, {})
     Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH))
     ActionView::LogSubscriber.attach_to :action_view
   end
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index ef9c5ce10c..073bd14783 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -11,6 +11,17 @@ class LookupContextTest < ActiveSupport::TestCase
     I18n.locale = :en
   end
 
+  test "allows to override default_formats with ActionView::Base.default_formats" do
+    begin
+      formats = ActionView::Base.default_formats
+      ActionView::Base.default_formats = [:foo, :bar]
+
+      assert_equal [:foo, :bar], ActionView::LookupContext.new([]).default_formats
+    ensure
+      ActionView::Base.default_formats = formats
+    end
+  end
+
   test "process view paths on initialization" do
     assert_kind_of ActionView::PathSet, @lookup_context.view_paths
   end
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/template/record_identifier_test.rb
index eb38b81e85..22038110a5 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/template/record_identifier_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'controller/fake_models'
 
 class RecordIdentifierTest < ActiveSupport::TestCase
-  include ActionController::RecordIdentifier
+  include ActionView::RecordIdentifier
 
   def setup
     @klass  = Comment
@@ -37,4 +37,13 @@ class RecordIdentifierTest < ActiveSupport::TestCase
   def test_dom_class_with_prefix
     assert_equal "custom_prefix_#{@singular}", dom_class(@record, :custom_prefix)
   end
+
+  def test_dom_id_as_singleton_method
+    @record.save
+    assert_equal "#{@singular}_1", ActionView::RecordIdentifier.dom_id(@record)
+  end
+
+  def test_dom_class_as_singleton_method
+    assert_equal @singular, ActionView::RecordIdentifier.dom_class(@record)
+  end
 end
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 061f5bb53f..86ba5f3b4d 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -59,6 +59,13 @@ class TestERBTemplate < ActiveSupport::TestCase
     @context = Context.new
   end
 
+  def test_mime_type_is_deprecated
+    template = new_template
+    assert_deprecated 'Template#mime_type is deprecated and will be removed' do
+      template.mime_type
+    end
+  end
+
   def test_basic_template
     @template = new_template
     assert_equal "Hello", render
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index f9f8c36fff..9c4271f19b 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -20,9 +20,9 @@ class UrlHelperTest < ActiveSupport::TestCase
     get "/article/:id" => "foo#article", :as => :article
   end
 
+  include ActionView::Helpers::UrlHelper
   include routes.url_helpers
 
-  include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::JavaScriptHelper
   include ActionDispatch::Assertions::DomAssertions
   include ActionView::Context