From 025c691536b22cc3f0ba802f6c303dd6f955c1c3 Mon Sep 17 00:00:00 2001
From: Piotr Chmolowski <piotr@chmolowski.pl>
Date: Sat, 8 Mar 2014 23:09:54 +0100
Subject: Ensure LookupContext in Digestor selects correct variant

Related to: #14242 #14243 14293

Variants passed to LookupContext#find() seem to be ignored, so
I've used the setter instead: `finder.variants = [ variant ]`.

I've also added some more test cases for variants. Hopefully this
time passing tests will mean it actually works.
---
 actionview/lib/action_view/digestor.rb             |  5 ++++-
 actionview/lib/action_view/helpers/cache_helper.rb | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'actionview/lib')

diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb
index da43fef2e3..4e3773abe7 100644
--- a/actionview/lib/action_view/digestor.rb
+++ b/actionview/lib/action_view/digestor.rb
@@ -126,7 +126,10 @@ module ActionView
       end
 
       def template
-        @template ||= finder.find(logical_name, [], partial?, formats: [ format ], variants: [ variant ])
+        @template ||= begin
+          finder.variants = [ variant ]
+          finder.find(logical_name, [], partial?, formats: [ format ])
+        end
       end
 
       def source
diff --git a/actionview/lib/action_view/helpers/cache_helper.rb b/actionview/lib/action_view/helpers/cache_helper.rb
index 30e4e5e329..3177d18c4d 100644
--- a/actionview/lib/action_view/helpers/cache_helper.rb
+++ b/actionview/lib/action_view/helpers/cache_helper.rb
@@ -165,10 +165,20 @@ module ActionView
 
       def fragment_name_with_digest(name) #:nodoc:
         if @virtual_path
-          [
-            *Array(name.is_a?(Hash) ? controller.url_for(name).split("://").last : name),
-            Digestor.digest(name: @virtual_path, format: formats.last.to_sym, variant: request.variant, finder: lookup_context, dependencies: view_cache_dependencies)
-          ]
+          variant = request.variant.is_a?(Array) ? request.variant.first : request.variant
+
+          options = {
+            name: @virtual_path,
+            format: formats.last.to_sym,
+            variant: variant,
+            finder: lookup_context,
+            dependencies: view_cache_dependencies
+          }
+
+          names = Array(name.is_a?(Hash) ? controller.url_for(name).split("://").last : name)
+          digest = Digestor.digest(options)
+
+          [*names, digest]
         else
           name
         end
-- 
cgit v1.2.3