Fix the resolver cache and stop mutating the lookup_context

Before we had a bug in the resolver cache so the disable_cache were not
working when passing options to find

2 files changed, 0 insertions, 21 deletions

diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index 72d1f43f12..1c47952f54 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -40,14 +40,6 @@ class FixtureFinder
   def disable_cache(&block)
     yield
   end
-
-  def with_formats_and_variants(new_formats, new_variants)
-    old_formats, old_variants = formats, variants
-    self.formats, self.variants = new_formats, new_variants
-    yield
-  ensure
-    self.formats, self.variants = old_formats, old_variants
-  end
 end
 
 class TemplateDigestorTest < ActionView::TestCase
diff --git a/actionview/test/template/lookup_context_test.rb b/actionview/test/template/lookup_context_test.rb
index b11f252110..4f7823045e 100644
--- a/actionview/test/template/lookup_context_test.rb
+++ b/actionview/test/template/lookup_context_test.rb
@@ -205,19 +205,6 @@ class LookupContextTest < ActiveSupport::TestCase
     @lookup_context.prefixes = ["foo"]
     assert_equal ["foo"], @lookup_context.prefixes
   end
-
-  test "with_formats_and_variants preserves original values after execution" do
-    @lookup_context.formats = [:html]
-    @lookup_context.variants = [:phone]
-
-    @lookup_context.with_formats_and_variants([:xml], [:tablet]) do
-      assert_equal [:xml], @lookup_context.formats
-      assert_equal [:tablet], @lookup_context.variants
-    end
-
-    assert_equal [:html], @lookup_context.formats
-    assert_equal [:phone], @lookup_context.variants
-  end
 end
 
 class LookupContextWithFalseCaching < ActiveSupport::TestCase