diff options
author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2014-03-12 15:42:21 +0100 |
---|---|---|
committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2014-03-14 13:18:14 +0100 |
commit | c63b18de1865182e027a97ea4186717a71792b81 (patch) | |
tree | caab2a586282b7a95907644312888dba55b0b52c /actionview/lib/action_view/testing | |
parent | 0ca6836a5a5dc249f82c98d34e17205a559157cf (diff) | |
download | rails-c63b18de1865182e027a97ea4186717a71792b81.tar.gz rails-c63b18de1865182e027a97ea4186717a71792b81.tar.bz2 rails-c63b18de1865182e027a97ea4186717a71792b81.zip |
Add variants to Template class
Diffstat (limited to 'actionview/lib/action_view/testing')
-rw-r--r-- | actionview/lib/action_view/testing/resolvers.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb index af53ad3b25..dfb7d463b4 100644 --- a/actionview/lib/action_view/testing/resolvers.rb +++ b/actionview/lib/action_view/testing/resolvers.rb @@ -30,9 +30,13 @@ module ActionView #:nodoc: @hash.each do |_path, array| source, updated_at = array next unless _path =~ query - handler, format = extract_handler_and_format(_path, formats) + handler, format, variant = extract_handler_and_format_and_variant(_path, formats) templates << Template.new(source, _path, handler, - :virtual_path => path.virtual, :format => format, :updated_at => updated_at) + :virtual_path => path.virtual, + :format => format, + :variant => variant, + :updated_at => updated_at + ) end templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size } @@ -41,8 +45,8 @@ module ActionView #:nodoc: class NullResolver < PathResolver def query(path, exts, formats) - handler, format = extract_handler_and_format(path, formats) - [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)] + handler, format, variant = extract_handler_and_format_and_variant(path, formats) + [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format, :variant => variant)] end end |