mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Deprecate rendering templates with . in the name" (#39012)
This commit is contained in:
parent
2a12b723bb
commit
876cc27609
6 changed files with 8 additions and 27 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ class RendererTest < ActiveSupport::TestCase
|
|||
xml = "<p>Hello world!</p>\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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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, [], {})
|
||||
|
|
Loading…
Reference in a new issue