Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-09 06:46:01 +01:00
Code Issues Packages Projects Releases Activity

Deprecate unused ApplicationHelper#render_if_exist (#39527).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22466 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2023-11-19 07:41:21 +00:00
parent d6b86ca53d
commit 291d23e5fe
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -1837,6 +1837,10 @@ module ApplicationHelper
end end
def render_if_exist(options = {}, locals = {}, &block) def render_if_exist(options = {}, locals = {}, &block)
# Remove test_render_if_exist_should_be_render_partial and test_render_if_exist_should_be_render_nil
# along with this method in Redmine 7.0
ActiveSupport::Deprecation.warn 'ApplicationHelper#render_if_exist is deprecated and will be removed in Redmine 7.0.'
if options[:partial] if options[:partial]
if lookup_context.exists?(options[:partial], lookup_context.prefixes, true) if lookup_context.exists?(options[:partial], lookup_context.prefixes, true)
render(options, locals, &block) render(options, locals, &block)

12
test/helpers/application_helper_test.rb
View File

@@ -2186,14 +2186,26 @@ class ApplicationHelperTest < Redmine::HelperTest
assert_match(/name="new_issue-[a-z0-9]{8}"/, labelled_form_for(Issue.new){}) assert_match(/name="new_issue-[a-z0-9]{8}"/, labelled_form_for(Issue.new){})
end end
# TODO: Remove this test when ApplicationHelper#render_if_exist is removed
def test_render_if_exist_should_be_render_partial def test_render_if_exist_should_be_render_partial
saved_behavior = ActiveSupport::Deprecation.behavior
ActiveSupport::Deprecation.behavior = :silence
controller.prepend_view_path "test/fixtures/views" controller.prepend_view_path "test/fixtures/views"
assert_equal "partial html\n", render_if_exist(:partial => 'partial') assert_equal "partial html\n", render_if_exist(:partial => 'partial')
ensure
ActiveSupport::Deprecation.behavior = saved_behavior
end end
# TODO: Remove this test when ApplicationHelper#render_if_exist is removed
def test_render_if_exist_should_be_render_nil def test_render_if_exist_should_be_render_nil
saved_behavior = ActiveSupport::Deprecation.behavior
ActiveSupport::Deprecation.behavior = :silence
controller.prepend_view_path "test/fixtures/views" controller.prepend_view_path "test/fixtures/views"
assert_nil render_if_exist(:partial => 'non_exist_partial') assert_nil render_if_exist(:partial => 'non_exist_partial')
ensure
ActiveSupport::Deprecation.behavior = saved_behavior
end end
def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8 def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8