Patch #43321 ยป remove-render_if_exist.patch
| app/helpers/application_helper.rb | ||
|---|---|---|
| 1915 | 1915 |
end |
| 1916 | 1916 |
end |
| 1917 | 1917 | |
| 1918 |
def render_if_exist(options = {}, locals = {}, &)
|
|
| 1919 |
# Remove test_render_if_exist_should_be_render_partial and test_render_if_exist_should_be_render_nil |
|
| 1920 |
# along with this method in Redmine 7.0 |
|
| 1921 |
Rails.application.deprecators[:redmine].warn 'ApplicationHelper#render_if_exist is deprecated and will be removed in Redmine 7.0.' |
|
| 1922 | ||
| 1923 |
if options[:partial] |
|
| 1924 |
if lookup_context.exists?(options[:partial], lookup_context.prefixes, true) |
|
| 1925 |
render(options, locals, &) |
|
| 1926 |
end |
|
| 1927 |
else |
|
| 1928 |
render(options, locals, &) |
|
| 1929 |
end |
|
| 1930 |
end |
|
| 1931 | ||
| 1932 | 1918 |
def heads_for_i18n |
| 1933 | 1919 |
javascript_tag( |
| 1934 | 1920 |
"rm = window.rm || {};" \
|
| test/helpers/application_helper_test.rb | ||
|---|---|---|
| 2292 | 2292 |
assert_match(/name="new_issue-[a-z0-9]{8}"/, labelled_form_for(Issue.new){})
|
| 2293 | 2293 |
end |
| 2294 | 2294 | |
| 2295 |
# TODO: Remove this test when ApplicationHelper#render_if_exist is removed |
|
| 2296 |
def test_render_if_exist_should_be_render_partial |
|
| 2297 |
saved_behavior = Rails.application.deprecators[:active_support].behavior |
|
| 2298 |
Rails.application.deprecators[:active_support].behavior = :silence |
|
| 2299 | ||
| 2300 |
controller.prepend_view_path "test/fixtures/views" |
|
| 2301 |
assert_equal "partial html\n", render_if_exist(:partial => 'partial') |
|
| 2302 |
ensure |
|
| 2303 |
Rails.application.deprecators[:active_support].behavior = saved_behavior |
|
| 2304 |
end |
|
| 2305 | ||
| 2306 |
# TODO: Remove this test when ApplicationHelper#render_if_exist is removed |
|
| 2307 |
def test_render_if_exist_should_be_render_nil |
|
| 2308 |
saved_behavior = Rails.application.deprecators[:active_support].behavior |
|
| 2309 |
Rails.application.deprecators[:active_support].behavior = :silence |
|
| 2310 | ||
| 2311 |
controller.prepend_view_path "test/fixtures/views" |
|
| 2312 |
assert_nil render_if_exist(:partial => 'non_exist_partial') |
|
| 2313 |
ensure |
|
| 2314 |
Rails.application.deprecators[:active_support].behavior = saved_behavior |
|
| 2315 |
end |
|
| 2316 | ||
| 2317 | 2295 |
def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8 |
| 2318 | 2296 |
with_locale 'az' do |
| 2319 | 2297 |
assert_equal l(:general_csv_encoding), 'UTF-8' |