Improve helper test coverage. Closes #7215, #7233, #7234, #7235, #7236, #7237, #7238.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7011 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 24 insertions, 9 deletions

diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 08bbd5e95f..ce830494a7 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -2,33 +2,34 @@ require "#{File.dirname(__FILE__)}/../abstract_unit"
 
 class JavaScriptHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::JavaScriptHelper
-  
+
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::CaptureHelper
-  
+
   def test_define_javascript_functions
     # check if prototype.js is included first
     assert_not_nil define_javascript_functions.split("\n")[1].match(/Prototype JavaScript framework/)
-    
+
     # check that scriptaculous.js is not in here, only needed if loaded remotely
     assert_nil define_javascript_functions.split("\n")[1].match(/var Scriptaculous = \{/)
   end
 
   def test_escape_javascript
+    assert_equal '', escape_javascript(nil)
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
     assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
   end
-                                      
+
   def test_link_to_function
-    assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>), 
+    assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
       link_to_function("Greeting", "alert('Hello world!')")
   end
-  
+
   def test_link_to_function_with_existing_onclick
-    assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>), 
+    assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
       link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
   end
 
@@ -47,12 +48,12 @@ class JavaScriptHelperTest < Test::Unit::TestCase
   end
 
   def test_link_to_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>), 
+    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
       link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
   end
 
   def test_button_to_function
-    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />), 
+    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
       button_to_function("Greeting", "alert('Hello world!')")
   end
 
@@ -70,6 +71,16 @@ class JavaScriptHelperTest < Test::Unit::TestCase
     assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;\\074h1\\076Greetings\\074/h1\\076&quot;);;" value="Greet me!" />), html
   end
 
+  def test_button_to_function_with_onclick
+    assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
+      button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
+  end
+
+  def test_button_to_function_without_function
+    assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
+      button_to_function("Greeting")
+  end
+
   def test_javascript_tag
     assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       javascript_tag("alert('hello')")
@@ -79,4 +90,8 @@ class JavaScriptHelperTest < Test::Unit::TestCase
     assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       javascript_tag("alert('hello')", :id => "the_js_tag")
   end
+
+  def test_javascript_cdata_section
+    assert_dom_equal "\n//<![CDATA[\nalert('hello')\n//]]>\n", javascript_cdata_section("alert('hello')")
+  end
 end