7 files changed, 84 insertions, 6 deletions
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/template/record_identifier_test.rb b/actionpack/test/template/record_identifier_test.rb
new file mode 100644
index 0000000000..22038110a5
--- /dev/null
+++ b/actionpack/test/template/record_identifier_test.rb
@@ -0,0 +1,49 @@
+require 'abstract_unit'
+require 'controller/fake_models'
+
+class RecordIdentifierTest < ActiveSupport::TestCase
+  include ActionView::RecordIdentifier
+
+  def setup
+    @klass  = Comment
+    @record = @klass.new
+    @singular = 'comment'
+    @plural = 'comments'
+    @uncountable = Sheep
+  end
+
+  def test_dom_id_with_new_record
+    assert_equal "new_#{@singular}", dom_id(@record)
+  end
+
+  def test_dom_id_with_new_record_and_prefix
+    assert_equal "custom_prefix_#{@singular}", dom_id(@record, :custom_prefix)
+  end
+
+  def test_dom_id_with_saved_record
+    @record.save
+    assert_equal "#{@singular}_1", dom_id(@record)
+  end
+
+  def test_dom_id_with_prefix
+    @record.save
+    assert_equal "edit_#{@singular}_1", dom_id(@record, :edit)
+  end
+
+  def test_dom_class
+    assert_equal @singular, dom_class(@record)
+  end
+
+  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