From 876cc2760971c542e54d1ad96dab43f209ef7ad0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 21 Apr 2020 15:59:46 -0700 Subject: [PATCH] Revert "Deprecate rendering templates with . in the name" (#39012) --- actionpack/test/controller/render_test.rb | 4 +--- actionpack/test/controller/renderer_test.rb | 2 +- actionview/lib/action_view/template/resolver.rb | 9 --------- .../fallback_file_system_resolver_test.rb | 2 +- actionview/test/template/render_test.rb | 16 ++++------------ .../test/template/resolver_shared_tests.rb | 2 +- 6 files changed, 8 insertions(+), 27 deletions(-) diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 474abff234..c94e60be0d 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -365,9 +365,7 @@ class ExpiresInRenderTest < ActionController::TestCase def test_dynamic_render assert File.exist?(File.expand_path("../../test/abstract_unit.rb", __dir__)) assert_raises ActionView::MissingTemplate do - assert_deprecated do - get :dynamic_render, params: { id: '../\\../test/abstract_unit.rb' } - end + get :dynamic_render, params: { id: '../\\../test/abstract_unit.rb' } end end diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb index 4d45c082d7..5dfebc0f37 100644 --- a/actionpack/test/controller/renderer_test.rb +++ b/actionpack/test/controller/renderer_test.rb @@ -109,7 +109,7 @@ 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.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 0f79f6febe..cc3d8bb072 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -227,10 +227,6 @@ module ActionView end def find_template_paths_from_details(path, details) - if path.name.include?(".") - ActiveSupport::Deprecation.warn("Rendering actions with '.' in the name is deprecated: #{path}") - end - query = build_query(path, details) find_template_paths(query) end @@ -335,11 +331,6 @@ module ActionView end def find_template_paths_from_details(path, details) - if path.name.include?(".") - # Fall back to the unoptimized resolver, which will warn - return super - end - candidates = find_candidate_template_paths(path) regex = build_regex(path, details) diff --git a/actionview/test/template/fallback_file_system_resolver_test.rb b/actionview/test/template/fallback_file_system_resolver_test.rb index d5290b5fe7..fa770f3a15 100644 --- a/actionview/test/template/fallback_file_system_resolver_test.rb +++ b/actionview/test/template/fallback_file_system_resolver_test.rb @@ -8,7 +8,7 @@ class FallbackFileSystemResolverTest < ActiveSupport::TestCase end def test_should_have_no_virtual_path - templates = @root_resolver.find_all("hello_world", "#{FIXTURE_LOAD_PATH}/test", false, locale: [], formats: [:html], variants: [], handlers: [:erb]) + templates = @root_resolver.find_all("hello_world.erb", "#{FIXTURE_LOAD_PATH}/test", false, locale: [], formats: [:html], variants: [], handlers: [:erb]) assert_equal 1, templates.size assert_equal "Hello world!", templates[0].source assert_nil templates[0].virtual_path diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index e315d6e4e6..ea4a3b643e 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -200,9 +200,7 @@ module RenderTestCases def test_render_outside_path assert File.exist?(File.expand_path("../../test/abstract_unit.rb", __dir__)) assert_raises ActionView::MissingTemplate do - assert_deprecated do - @view.render(template: "../\\../test/abstract_unit.rb") - end + @view.render(template: "../\\../test/abstract_unit.rb") end end @@ -340,10 +338,8 @@ module RenderTestCases 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 + assert_equal "Hello: davidHello: mary", + @view.render(partial: "test/customer.mobile", collection: [ Customer.new("david"), Customer.new("mary") ]) end def test_render_partial_collection_as_by_string @@ -583,11 +579,7 @@ module RenderTestCases def test_render_ignores_templates_with_malformed_template_handlers %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name| assert File.exist?(File.expand_path("#{FIXTURE_LOAD_PATH}/test/malformed/#{name}~")), "Malformed file (#{name}~) which should be ignored does not exists" - assert_raises(ActionView::MissingTemplate) do - ActiveSupport::Deprecation.silence do - @view.render(template: "test/malformed/#{name}") - end - end + assert_raises(ActionView::MissingTemplate) { @view.render(template: "test/malformed/#{name}") } end end diff --git a/actionview/test/template/resolver_shared_tests.rb b/actionview/test/template/resolver_shared_tests.rb index 332eb30a58..470628af11 100644 --- a/actionview/test/template/resolver_shared_tests.rb +++ b/actionview/test/template/resolver_shared_tests.rb @@ -169,7 +169,7 @@ module ResolverSharedTests def test_virtual_path_is_preserved_with_dot with_file "test/hello_world.html.erb", "Hello html!" - template = assert_deprecated { context.find("hello_world.html", "test", false, [], {}) } + template = context.find("hello_world.html", "test", false, [], {}) assert_equal "test/hello_world.html", template.virtual_path template = context.find("hello_world", "test", false, [], {})