Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test

Avoid hard-coded value in test setup and teardown.

1 files changed, 3 insertions, 3 deletions

diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb
index 4703111741..9ba7f64ad1 100644
--- a/actionview/test/template/javascript_helper_test.rb
+++ b/actionview/test/template/javascript_helper_test.rb
@@ -12,14 +12,14 @@ class JavaScriptHelperTest < ActionView::TestCase
     yield if block_given?
   end
 
-  def setup
-    super
+  setup do
+    @old_escape_html_entities_in_json = ActiveSupport.escape_html_entities_in_json
     ActiveSupport.escape_html_entities_in_json  = true
     @template = self
   end
 
   def teardown
-    ActiveSupport.escape_html_entities_in_json  = false
+    ActiveSupport.escape_html_entities_in_json = @old_escape_html_entities_in_json
   end
 
   def test_escape_javascript