Merge pull request #15712 from zuhao/refactor_actionview_javascript_h…

…elper_test Avoid hard-coded value in test setup and teardown.
rails · Jun 14, 2014 · 534e1e1 · 534e1e1
2 parents a041107 + 0da1c80
commit 534e1e1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb
@@ -12,14 +12,14 @@ def update_details(details)
     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