aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/testing/resolvers.rb
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-02-25 22:56:13 -0800
committerJohn Hawthorn <john@hawthorn.email>2019-02-26 16:59:04 -0800
commitbcd42ae974eb04cb5def7a01d194e70b87bc4152 (patch)
treeb5137a5db13808ce84bed7ed121cbe21a4c57ea5 /actionview/lib/action_view/testing/resolvers.rb
parentc2145462178d2b28135fac38ebbceeaadfa151df (diff)
downloadrails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.tar.gz
rails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.tar.bz2
rails-bcd42ae974eb04cb5def7a01d194e70b87bc4152.zip
Remove query_format argument from resolver
Diffstat (limited to 'actionview/lib/action_view/testing/resolvers.rb')
-rw-r--r--actionview/lib/action_view/testing/resolvers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb
index 2305fc9b81..3ca8420c6c 100644
--- a/actionview/lib/action_view/testing/resolvers.rb
+++ b/actionview/lib/action_view/testing/resolvers.rb
@@ -34,7 +34,7 @@ module ActionView #:nodoc:
@hash.each do |_path, array|
source, updated_at = array
next unless query.match?(_path)
- handler, format, variant = extract_handler_and_format_and_variant(_path, :html)
+ handler, format, variant = extract_handler_and_format_and_variant(_path)
templates << Template.new(source, _path, handler,
virtual_path: path.virtual,
format: format,
@@ -50,7 +50,7 @@ module ActionView #:nodoc:
class NullResolver < PathResolver
def query(path, exts, _, _, locals)
- handler, format, variant = extract_handler_and_format_and_variant(path, :html)
+ handler, format, variant = extract_handler_and_format_and_variant(path)
[ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant, locals: locals)]
end
end