Use identifiers for template equality.

2 files changed, 16 insertions, 9 deletions

diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb
index 12892b7255..63de25be52 100644
--- a/actionpack/test/controller/new_base/render_once_test.rb
+++ b/actionpack/test/controller/new_base/render_once_test.rb
@@ -61,13 +61,12 @@ module RenderTemplate
     include Tests
   end
 
-  # TODO This still needs to be implemented and supported.
-  # class TestWithoutResolverCache < Rack::TestCase
-  #   testing RenderTemplate::RenderOnceController
-  #   include Tests
-  #
-  #   def setup
-  #     RenderTemplate::RenderOnceController::RESOLVER.stubs(:caching?).returns(false)
-  #   end
-  # end
+  class TestWithoutResolverCache < Rack::TestCase
+    testing RenderTemplate::RenderOnceController
+    include Tests
+
+    def setup
+      RenderTemplate::RenderOnceController::RESOLVER.stubs(:caching?).returns(false)
+    end
+  end
 end
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 63f792d328..f2156c31de 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -151,6 +151,14 @@ class TestERBTemplate < ActiveSupport::TestCase
     end
   end
 
+  def test_inline_template_is_only_equal_if_source_match
+    inline1 = ActionView::Template::Inline.new("sample", ERBHandler)
+    inline2 = ActionView::Template::Inline.new("sample", ERBHandler)
+    inline3 = ActionView::Template::Inline.new("other",  ERBHandler)
+    assert inline1.eql?(inline2)
+    assert !inline1.eql?(inline3)
+  end
+
   if "ruby".encoding_aware?
     def test_resulting_string_is_utf8
       @template = new_template