Remove query_format argument from resolver

3 files changed, 5 insertions, 5 deletions

diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index f2b8b1166d..1dc9c9919a 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -212,7 +212,7 @@ module ActionView
         template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
 
         template_paths.map do |template|
-          handler, format, variant = extract_handler_and_format_and_variant(template, formats.first)
+          handler, format, variant = extract_handler_and_format_and_variant(template)
 
           FileTemplate.new(File.expand_path(template), handler,
             virtual_path: path.virtual,
@@ -280,7 +280,7 @@ module ActionView
       # Extract handler, formats and variant from path. If a format cannot be found neither
       # from the path, or the handler, we should return the array of formats given
       # to the resolver.
-      def extract_handler_and_format_and_variant(path, query_format)
+      def extract_handler_and_format_and_variant(path)
         pieces = File.basename(path).split(".")
         pieces.shift
 
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
diff --git a/actionview/test/template/testing/null_resolver_test.rb b/actionview/test/template/testing/null_resolver_test.rb
index dad8d0966d..c7c78804c0 100644
--- a/actionview/test/template/testing/null_resolver_test.rb
+++ b/actionview/test/template/testing/null_resolver_test.rb
@@ -9,6 +9,6 @@ class NullResolverTest < ActiveSupport::TestCase
     assert_equal 1, templates.size, "expected one template"
     assert_equal "Template generated by Null Resolver", templates.first.source
     assert_equal "arbitrary/path.erb", templates.first.virtual_path.to_s
-    assert_equal :html, templates.first.format
+    assert_nil templates.first.format
   end
 end