aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/prototype_helper_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-01-10 18:25:17 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-01-10 18:25:17 -0800
commit2c2b84f93c6eb1a170467c1340a4eeddfa13f7da (patch)
treed8f2cba36153d0168f0e499afedec864312de94e /actionpack/test/template/prototype_helper_test.rb
parent5ddc597066603875b4e59c811d0d78c84842111c (diff)
downloadrails-2c2b84f93c6eb1a170467c1340a4eeddfa13f7da.tar.gz
rails-2c2b84f93c6eb1a170467c1340a4eeddfa13f7da.tar.bz2
rails-2c2b84f93c6eb1a170467c1340a4eeddfa13f7da.zip
Javascript tests expects the old default of escaping HTML, make it so for now
Diffstat (limited to 'actionpack/test/template/prototype_helper_test.rb')
-rw-r--r--actionpack/test/template/prototype_helper_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 313a769088..9225153798 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -317,6 +317,11 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
def setup
super
@generator = create_generator
+ ActiveSupport.escape_html_entities_in_json = true
+ end
+
+ def teardown
+ ActiveSupport.escape_html_entities_in_json = false
end
def _evaluate_assigns_and_ivars() end