diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb index 7b765d426f..e64dbd6a64 100644 --- a/actionpack/test/controller/renderer_test.rb +++ b/actionpack/test/controller/renderer_test.rb @@ -109,7 +109,6 @@ class RendererTest < ActiveSupport::TestCase xml = "

Hello world!

\n" assert_equal html, render["respond_to/using_defaults"] - assert_equal xml, assert_deprecated { render["respond_to/using_defaults.xml.builder"] } assert_equal xml, render["respond_to/using_defaults", formats: :xml] end diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb index 6d01614084..39c44011ba 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -252,7 +252,7 @@ module ActionView def find_template_paths_from_details(path, details) if path.name.include?(".") - ActiveSupport::Deprecation.warn("Rendering actions with '.' in the name is deprecated: #{path}") + return [] end query = build_query(path, details) @@ -362,8 +362,7 @@ module ActionView def find_template_paths_from_details(path, details) if path.name.include?(".") - # Fall back to the unoptimized resolver, which will warn - return super + return [] end candidates = find_candidate_template_paths(path) diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index c2951d9ded..bd5c558425 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -331,13 +331,6 @@ module RenderTestCases assert_equal "Hello: davidHello: mary", @view.render(partial: "test/customer", collection: [ Customer.new("david"), Customer.new("mary") ]) end - def test_render_partial_collection_with_partial_name_containing_dot - assert_deprecated do - assert_equal "Hello: davidHello: mary", - @view.render(partial: "test/customer.mobile", collection: [ Customer.new("david"), Customer.new("mary") ]) - end - end - def test_render_partial_collection_as_by_string assert_equal "david david davidmary mary mary", @view.render(partial: "test/customer_with_var", collection: [ Customer.new("david"), Customer.new("mary") ], as: "customer") diff --git a/actionview/test/template/resolver_shared_tests.rb b/actionview/test/template/resolver_shared_tests.rb index f513cca0bb..37452defd2 100644 --- a/actionview/test/template/resolver_shared_tests.rb +++ b/actionview/test/template/resolver_shared_tests.rb @@ -227,13 +227,9 @@ module ResolverSharedTests assert_equal "mobile", templates[0].variant end - def test_virtual_path_is_preserved_with_dot + def test_returns_no_results_with_dot with_file "test/hello_world.html.erb", "Hello html!" - template = assert_deprecated { context.find("hello_world.html", "test", false, [], {}) } - assert_equal "test/hello_world.html", template.virtual_path - - template = context.find("hello_world", "test", false, [], {}) - assert_equal "test/hello_world", template.virtual_path + assert_empty context.find_all("hello_world.html", "test", false, [], {}) end end