diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-10 18:25:17 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-10 18:25:17 -0800 |
| commit | 2c2b84f93c6eb1a170467c1340a4eeddfa13f7da (patch) | |
| tree | d8f2cba36153d0168f0e499afedec864312de94e /actionpack/test/template | |
| parent | 5ddc597066603875b4e59c811d0d78c84842111c (diff) | |
| download | rails-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')
| -rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/template/prototype_helper_test.rb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index f0f686f6e2..03caad3d46 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -13,8 +13,13 @@ class JavaScriptHelperTest < ActionView::TestCase def setup super + ActiveSupport.escape_html_entities_in_json = true @template = self end + + def teardown + ActiveSupport.escape_html_entities_in_json = false + end def _evaluate_assigns_and_ivars() end 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 |