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

1 files changed, 8 insertions, 9 deletions

diff --git a/actionview/lib/action_view/lookup_context.rb b/actionview/lib/action_view/lookup_context.rb
index d7f116c10c..855fed0190 100644
--- a/actionview/lib/action_view/lookup_context.rb
+++ b/actionview/lib/action_view/lookup_context.rb
@@ -159,7 +159,14 @@ module ActionView
       def detail_args_for(options)
         return @details, details_key if options.empty? # most common path.
         user_details = @details.merge(options)
-        [user_details, DetailsKey.get(user_details)]
+
+        if @cache
+          details_key = DetailsKey.get(user_details)
+        else
+          details_key = nil
+        end
+
+        [user_details, details_key]
       end
 
       # Support legacy foo.erb names even though we now ignore .erb
@@ -246,13 +253,5 @@ module ActionView
         end
       end
     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
 end