aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2014-03-13 16:55:54 +0100
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2014-03-14 13:18:21 +0100
commit03b8922ee4ba6051ae18917b5904f8664e715695 (patch)
treee942b39302e68773ca1cf0fe347bf305616a9659 /actionview
parent3b9daf0ff9f7981d375e7617b1ec46e9fc988aaa (diff)
downloadrails-03b8922ee4ba6051ae18917b5904f8664e715695.tar.gz
rails-03b8922ee4ba6051ae18917b5904f8664e715695.tar.bz2
rails-03b8922ee4ba6051ae18917b5904f8664e715695.zip
Set format in finder
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/template/digestor_test.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index 0580758dab..2d4c434f9c 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -16,10 +16,12 @@ class FixtureFinder
FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
attr_reader :details
+ attr_accessor :formats
attr_accessor :variants
def initialize
@details = {}
+ @formats = []
@variants = []
end
@@ -27,9 +29,9 @@ class FixtureFinder
details.hash
end
- def find(logical_name, keys, partial, options)
- partial_name = partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name
- format = options[:formats].first.to_s
+ def find(name, prefixes = [], partial = false, keys = [], options = {})
+ partial_name = partial ? name.gsub(%r|/([^/]+)$|, '/_\1') : name
+ format = @formats.first.to_s
format += "+#{@variants.first}" if @variants.any?
FixtureTemplate.new("digestor/#{partial_name}.#{format}.erb")
@@ -288,6 +290,9 @@ class TemplateDigestorTest < ActionView::TestCase
def digest(template_name, options = {})
options = options.dup
+ finder.formats = [:html]
+ finder.variants = [options[:variant]] if options[:variant].present?
+
ActionView::Digestor.digest({ name: template_name, format: :html, finder: finder }.merge(options))
end