diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-11 15:18:24 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-11 15:18:24 +0100 |
| commit | a9eebde8561df5c7c34669587c9e25e8baeeeabb (patch) | |
| tree | 27f1f2b8642f94db9d386cfb5866ffd471354f02 /actionpack/test/template/javascript_helper_test.rb | |
| parent | c1239e6509d27f88db2fc59189fd9a95333283e1 (diff) | |
| parent | 02bbde4e78f958d5495c19d953aaec58bb8ef998 (diff) | |
| download | rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.tar.gz rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.tar.bz2 rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/template/javascript_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 5 |
1 files changed, 5 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 |