From 8c8652c37f6f6969ce48d579a8c9a8ff668f995a Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Thu, 9 Jun 2011 14:00:10 -0400 Subject: Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe --- actionpack/test/template/javascript_helper_test.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack/test/template') diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index 15bd6b4c47..dd8b7b7cd5 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -35,6 +35,8 @@ class JavaScriptHelperTest < ActionView::TestCase expect = %(\\'quoted\\' \\"double-quoted\\" new-line:\\n <\\/closed>) assert_equal expect, escape_javascript(given) assert_equal expect, escape_javascript(ActiveSupport::SafeBuffer.new(given)) + assert_instance_of String, escape_javascript(given) + assert_instance_of ActiveSupport::SafeBuffer, escape_javascript(ActiveSupport::SafeBuffer.new(given)) end def test_button_to_function -- cgit v1.2.3