Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 1 insertions, 38 deletions

diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 8aa2730da1..538e0e9874 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -35,20 +35,6 @@ class JavaScriptHelperTest < ActionView::TestCase
       button_to_function("Greeting", "alert('Hello world!')")
   end
 
-  def test_button_to_function_with_rjs_block
-    html = button_to_function( "Greet me!" ) do |page|
-      page.replace_html 'header', "<h1>Greetings</h1>"
-    end
-    assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E&quot;);;" value="Greet me!" />), html
-  end
-
-  def test_button_to_function_with_rjs_block_and_options
-    html = button_to_function( "Greet me!", :class => "greeter" ) do |page|
-      page.replace_html 'header', "<h1>Greetings</h1>"
-    end
-    assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;\\u003Ch1\\u003EGreetings\\u003C\/h1\\u003E&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 :(')")
@@ -69,34 +55,11 @@ class JavaScriptHelperTest < ActionView::TestCase
       link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
   end
 
-  def test_link_to_function_with_rjs_block
-    html = link_to_function( "Greet me!" ) do |page|
-      page.replace_html 'header', "<h1>Greetings</h1>"
-    end
-    assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E&quot;);; return false;">Greet me!</a>), html
-  end
-
-  def test_link_to_function_with_rjs_block_and_options
-    html = link_to_function( "Greet me!", :class => "updater" ) do |page|
-      page.replace_html 'header', "<h1>Greetings</h1>"
-    end
-    assert_dom_equal %(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E&quot;);; return false;">Greet me!</a>), html
-  end
-
-  def test_link_to_function_with_href
+  def test_function_with_href
     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_link_to_function_with_inner_block_does_not_raise_exception
-    html = link_to_function( "Greet me!" ) do |page|
-      page.replace_html 'header', (content_tag :h1 do
-        'Greetings'
-      end)
-    end
-    assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E&quot;);; return false;">Greet me!</a>), html
-  end
-
   def test_javascript_tag
     self.output_buffer = 'foo'