From 07aab5a2803c2a126eae2524e45f0846c898f4b2 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 1 Dec 2023 06:59:04 +0000 Subject: [PATCH] Fix deprecation warnings regarding the use of ActiveSupport::Deprecation.behavior (#39527, #36320). git-svn-id: https://svn.redmine.org/redmine/trunk@22493 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/helpers/application_helper_test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 7387487f2..8dccb8b7e 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -2188,24 +2188,24 @@ class ApplicationHelperTest < Redmine::HelperTest # TODO: Remove this test when ApplicationHelper#render_if_exist is removed def test_render_if_exist_should_be_render_partial - saved_behavior = ActiveSupport::Deprecation.behavior - ActiveSupport::Deprecation.behavior = :silence + saved_behavior = Rails.application.deprecators[:active_support].behavior + Rails.application.deprecators[:active_support].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 + Rails.application.deprecators[:active_support].behavior = saved_behavior end # TODO: Remove this test when ApplicationHelper#render_if_exist is removed def test_render_if_exist_should_be_render_nil - saved_behavior = ActiveSupport::Deprecation.behavior - ActiveSupport::Deprecation.behavior = :silence + saved_behavior = Rails.application.deprecators[:active_support].behavior + Rails.application.deprecators[:active_support].behavior = :silence controller.prepend_view_path "test/fixtures/views" assert_nil render_if_exist(:partial => 'non_exist_partial') ensure - ActiveSupport::Deprecation.behavior = saved_behavior + Rails.application.deprecators[:active_support].behavior = saved_behavior end def test_export_csv_encoding_select_tag_should_return_nil_when_general_csv_encoding_is_UTF8