Skip to content

Commit

Permalink
Set format in finder
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszx0 committed Mar 14, 2014
1 parent 3b9daf0 commit 03b8922
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions actionview/test/template/digestor_test.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,20 +16,22 @@ class FixtureFinder
FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor" FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"


attr_reader :details attr_reader :details
attr_accessor :formats
attr_accessor :variants attr_accessor :variants


def initialize def initialize
@details = {} @details = {}
@formats = []
@variants = [] @variants = []
end end


def details_key def details_key
details.hash details.hash
end end


def find(logical_name, keys, partial, options) def find(name, prefixes = [], partial = false, keys = [], options = {})
partial_name = partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name partial_name = partial ? name.gsub(%r|/([^/]+)$|, '/_\1') : name
format = options[:formats].first.to_s format = @formats.first.to_s
format += "+#{@variants.first}" if @variants.any? format += "+#{@variants.first}" if @variants.any?


FixtureTemplate.new("digestor/#{partial_name}.#{format}.erb") FixtureTemplate.new("digestor/#{partial_name}.#{format}.erb")
Expand Down Expand Up @@ -288,6 +290,9 @@ def assert_digest_difference(template_name, persistent = false, options = {})


def digest(template_name, options = {}) def digest(template_name, options = {})
options = options.dup 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)) ActionView::Digestor.digest({ name: template_name, format: :html, finder: finder }.merge(options))
end end


Expand Down

0 comments on commit 03b8922

Please sign in to comment.