diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a1d989e25..c284ff215 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1837,6 +1837,10 @@ module ApplicationHelper end def render_if_exist(options = {}, locals = {}, &block) + # Remove test_redner_if_exist_should_be_render_partial and test_redner_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 lookup_context.exists?(options[:partial], lookup_context.prefixes, true) render(options, locals, &block) diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 180066b17..e46392cd6 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -2186,14 +2186,26 @@ class ApplicationHelperTest < Redmine::HelperTest assert_match(/name="new_issue-[a-z0-9]{8}"/, labelled_form_for(Issue.new){}) end + # TODO: Remove this test when ApplicationHelper#render_if_exist is removed def test_redner_if_exist_should_be_render_partial + saved_behavior = ActiveSupport::Deprecation.behavior + ActiveSupport::Deprecation.behavior = :silence + controller.prepend_view_path "test/fixtures/views" assert_equal "partial html\n", render_if_exist(:partial => 'partial') + ensure + ActiveSupport::Deprecation.behavior = saved_behavior end + # TODO: Remove this test when ApplicationHelper#render_if_exist is removed def test_redner_if_exist_should_be_render_nil + saved_behavior = ActiveSupport::Deprecation.behavior + ActiveSupport::Deprecation.behavior = :silence + controller.prepend_view_path "test/fixtures/views" assert_nil render_if_exist(:partial => 'non_exist_partial') + ensure + ActiveSupport::Deprecation.behavior = saved_behavior end def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8