From 72f93b581f1d1a7496ccebbd90578714c171c5a5 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 19 Jun 2008 22:03:27 -0700
Subject: Check whether blocks are called from erb using a special
 __in_erb_template variable visible in block binding.

---
 actionpack/test/template/prototype_helper_test.rb | 137 +++++++++++-----------
 1 file changed, 69 insertions(+), 68 deletions(-)

(limited to 'actionpack/test/template/prototype_helper_test.rb')

diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index a5be0d2789..60b83b476d 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -54,7 +54,7 @@ class PrototypeHelperBaseTest < ActionView::TestCase
     end
 
     def create_generator
-      block = Proc.new { |*args| yield *args if block_given? } 
+      block = Proc.new { |*args| yield *args if block_given? }
       JavaScriptGenerator.new self, &block
     end
 end
@@ -70,7 +70,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<a class=\"fine\" href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", { :url => { :action => "whatnot"  }}, { :class => "fine"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onComplete:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
-      link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot"  })      
+      link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onSuccess:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", :success => "alert(request.responseText)", :url => { :action => "whatnot"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
@@ -78,12 +78,12 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot?a=10&amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
   end
-  
+
   def test_link_to_remote_html_options
     assert_dom_equal %(<a class=\"fine\" href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", { :url => { :action => "whatnot"  }, :html => { :class => "fine" } })
   end
-  
+
   def test_link_to_remote_url_quote_escaping
     assert_dom_equal %(<a href="#" onclick="new Ajax.Request('http://www.example.com/whatnot\\\'s', {asynchronous:true, evalScripts:true}); return false;">Remote</a>),
       link_to_remote("Remote", { :url => { :action => "whatnot's" } })
@@ -93,14 +93,14 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<script type="text/javascript">\n//<![CDATA[\nnew PeriodicalExecuter(function() {new Ajax.Updater('schremser_bier', 'http://www.example.com/mehr_bier', {asynchronous:true, evalScripts:true})}, 10)\n//]]>\n</script>),
       periodically_call_remote(:update => "schremser_bier", :url => { :action => "mehr_bier" })
   end
-  
+
   def test_periodically_call_remote_with_frequency
     assert_dom_equal(
       "<script type=\"text/javascript\">\n//<![CDATA[\nnew PeriodicalExecuter(function() {new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true})}, 2)\n//]]>\n</script>",
       periodically_call_remote(:frequency => 2)
     )
   end
-  
+
   def test_form_remote_tag
     assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  })
@@ -117,21 +117,22 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :html => { :method => :put })
   end
 
-  def test_form_remote_tag_with_block
+  def test_form_remote_tag_with_block_in_erb
+    __in_erb_template = ''
     form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }) { concat "Hello world!" }
     assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\">Hello world!</form>), output_buffer
   end
 
   def test_remote_form_for_with_record_identification_with_new_record
     remote_form_for(@record, {:html => { :id => 'create-author' }}) {}
-    
+
     expected = %(<form action='#{authors_path}' onsubmit="new Ajax.Request('#{authors_path}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_author' id='create-author' method='post'></form>)
     assert_dom_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_record_identification_without_html_options
     remote_form_for(@record) {}
-    
+
     expected = %(<form action='#{authors_path}' onsubmit="new Ajax.Request('#{authors_path}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_author' method='post' id='new_author'></form>)
     assert_dom_equal expected, output_buffer
   end
@@ -139,23 +140,23 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
   def test_remote_form_for_with_record_identification_with_existing_record
     @record.save
     remote_form_for(@record) {}
-    
+
     expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_new_object_in_list
     remote_form_for([@author, @article]) {}
-    
+
     expected = %(<form action='#{author_articles_path(@author)}' onsubmit="new Ajax.Request('#{author_articles_path(@author)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_article' method='post' id='new_article'></form>)
     assert_dom_equal expected, output_buffer
   end
-  
+
   def test_remote_form_for_with_existing_object_in_list
     @author.save
     @article.save
     remote_form_for([@author, @article]) {}
-    
+
     expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
@@ -172,18 +173,18 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater({success:'glass_of_beer',failure:'glass_of_water'}, 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, on#{callback.to_s.capitalize}:function(request){monkeys();}, parameters:Form.serialize(this)}); return false;">),
         form_remote_tag(:update => { :success => "glass_of_beer", :failure => "glass_of_water" }, :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #HTTP status codes 200 up to 599 have callbacks
     #these should work
     100.upto(599) do |callback|
       assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, on#{callback.to_s.capitalize}:function(request){monkeys();}, parameters:Form.serialize(this)}); return false;">),
         form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #test 200 and 404
     assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, on200:function(request){monkeys();}, on404:function(request){bananas();}, parameters:Form.serialize(this)}); return false;">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, 200=>"monkeys();", 404=>"bananas();")
-    
+
     #these shouldn't
     1.upto(99) do |callback|
       assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;">),
@@ -193,44 +194,44 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;">),
         form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #test ultimate combo
     assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, on200:function(request){monkeys();}, on404:function(request){bananas();}, onComplete:function(request){c();}, onFailure:function(request){f();}, onLoading:function(request){c1()}, onSuccess:function(request){s()}, parameters:Form.serialize(this)}); return false;\">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :loading => "c1()", :success => "s()", :failure => "f();", :complete => "c();", 200=>"monkeys();", 404=>"bananas();")
-    
+
   end
-  
+
   def test_submit_to_remote
     assert_dom_equal %(<input name=\"More beer!\" onclick=\"new Ajax.Updater('empty_bottle', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this.form)}); return false;\" type=\"button\" value=\"1000000\" />),
       submit_to_remote("More beer!", 1_000_000, :update => "empty_bottle")
   end
-  
+
   def test_observe_field
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/reorder_if_empty', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_field("glass", :frequency => 5.minutes, :url => { :action => "reorder_if_empty" })
   end
-  
+
   def test_observe_field_using_with_option
     expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(value)})})\n//]]>\n</script>)
     assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => 'id')
     assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + encodeURIComponent(value)")
   end
-  
+
   def test_observe_field_using_json_in_with_option
     expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:{'id':value}})})\n//]]>\n</script>)
-    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}")    
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}")
   end
-  
+
   def test_observe_field_using_function_for_callback
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {alert('Element changed')})\n//]]>\n</script>),
       observe_field("glass", :frequency => 5.minutes, :function => "alert('Element changed')")
   end
-  
+
   def test_observe_form
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {new Ajax.Request('http://www.example.com/cart_changed', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_form("cart", :frequency => 2, :url => { :action => "cart_changed" })
   end
-  
+
   def test_observe_form_using_function_for_callback
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {alert('Form changed')})\n//]]>\n</script>),
       observe_form("cart", :frequency => 2, :function => "alert('Form changed')")
@@ -245,7 +246,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     block = Proc.new { |page| page.replace_html('foo', 'bar') }
     assert_equal create_generator(&block).to_s, update_page(&block)
   end
-  
+
   def test_update_page_tag
     block = Proc.new { |page| page.replace_html('foo', 'bar') }
     assert_equal javascript_tag(create_generator(&block).to_s), update_page_tag(&block)
@@ -261,15 +262,15 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     def author_path(record)
       "/authors/#{record.id}"
     end
-    
+
     def authors_path
       "/authors"
     end
-    
+
     def author_articles_path(author)
       "/authors/#{author.id}/articles"
     end
-    
+
     def author_article_path(author, article)
       "/authors/#{author.id}/articles/#{article.id}"
     end
@@ -280,7 +281,7 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     super
     @generator = create_generator
   end
-  
+
   def test_insert_html_with_string
     assert_equal 'new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");',
       @generator.insert_html(:top, 'element', '<p>This is a test</p>')
@@ -291,56 +292,56 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     assert_equal 'new Insertion.After("element", "\\u003Cp\u003EThis is a test\\u003C/p\u003E");',
       @generator.insert_html(:after, 'element', '<p>This is a test</p>')
   end
-  
+
   def test_replace_html_with_string
     assert_equal 'Element.update("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");',
       @generator.replace_html('element', '<p>This is a test</p>')
   end
-  
+
   def test_replace_element_with_string
     assert_equal 'Element.replace("element", "\\u003Cdiv id=\"element\"\\u003E\\u003Cp\\u003EThis is a test\\u003C/p\\u003E\\u003C/div\\u003E");',
       @generator.replace('element', '<div id="element"><p>This is a test</p></div>')
   end
-  
+
   def test_remove
     assert_equal 'Element.remove("foo");',
       @generator.remove('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.remove);',
       @generator.remove('foo', 'bar', 'baz')
   end
-  
+
   def test_show
     assert_equal 'Element.show("foo");',
       @generator.show('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.show);',
-      @generator.show('foo', 'bar', 'baz')  
+      @generator.show('foo', 'bar', 'baz')
   end
-  
+
   def test_hide
     assert_equal 'Element.hide("foo");',
       @generator.hide('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.hide);',
-      @generator.hide('foo', 'bar', 'baz')  
+      @generator.hide('foo', 'bar', 'baz')
   end
-  
+
   def test_toggle
     assert_equal 'Element.toggle("foo");',
       @generator.toggle('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.toggle);',
-      @generator.toggle('foo', 'bar', 'baz')  
+      @generator.toggle('foo', 'bar', 'baz')
   end
-    
+
   def test_alert
     assert_equal 'alert("hello");', @generator.alert('hello')
   end
-  
+
   def test_redirect_to
     assert_equal 'window.location.href = "http://www.example.com/welcome";',
       @generator.redirect_to(:action => 'welcome')
     assert_equal 'window.location.href = "http://www.example.com/welcome?a=b&c=d";',
       @generator.redirect_to("http://www.example.com/welcome?a=b&c=d")
   end
-  
+
   def test_reload
     assert_equal 'window.location.reload();',
       @generator.reload
@@ -350,16 +351,16 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     @generator.delay(20) do
       @generator.hide('foo')
     end
-    
+
     assert_equal "setTimeout(function() {\n;\nElement.hide(\"foo\");\n}, 20000);", @generator.to_s
   end
-  
+
   def test_to_s
     @generator.insert_html(:top, 'element', '<p>This is a test</p>')
     @generator.insert_html(:bottom, 'element', '<p>This is a test</p>')
     @generator.remove('foo', 'bar')
     @generator.replace_html('baz', '<p>This is a test</p>')
-    
+
     assert_equal <<-EOS.chomp, @generator.to_s
 new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
 new Insertion.Bottom("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
@@ -381,12 +382,12 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator['hello'].hide
     assert_equal %($("hello").hide();), @generator.to_s
   end
-  
+
   def test_element_proxy_variable_access
     @generator['hello']['style']
     assert_equal %($("hello").style;), @generator.to_s
   end
-  
+
   def test_element_proxy_variable_access_with_assignment
     @generator['hello']['style']['color'] = 'red'
     assert_equal %($("hello").style.color = "red";), @generator.to_s
@@ -401,7 +402,7 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator['hello'].hide("first").clean_whitespace
     assert_equal %($("hello").hide("first").cleanWhitespace();), @generator.to_s
   end
-  
+
   def test_select_access
     assert_equal %($$("div.hello");), @generator.select('div.hello')
   end
@@ -410,29 +411,29 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator.select('p.welcome b').first.hide
     assert_equal %($$("p.welcome b").first().hide();), @generator.to_s
   end
-  
+
   def test_visual_effect
-    assert_equal %(new Effect.Puff("blah",{});), 
+    assert_equal %(new Effect.Puff("blah",{});),
       @generator.visual_effect(:puff,'blah')
-  end 
-  
+  end
+
   def test_visual_effect_toggle
-    assert_equal %(Effect.toggle("blah",'appear',{});), 
+    assert_equal %(Effect.toggle("blah",'appear',{});),
       @generator.visual_effect(:toggle_appear,'blah')
   end
-  
+
   def test_sortable
-    assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("blah")})}});), 
+    assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("blah")})}});),
       @generator.sortable('blah', :url => { :action => "order" })
   end
-  
+
   def test_draggable
-    assert_equal %(new Draggable("blah", {});), 
+    assert_equal %(new Draggable("blah", {});),
       @generator.draggable('blah')
   end
-  
+
   def test_drop_receiving
-    assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});), 
+    assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});),
       @generator.drop_receiving('blah', :url => { :action => "order" })
   end
 
@@ -534,7 +535,7 @@ return array.reverse();
 });
     EOS
   end
-  
+
   def test_collection_proxy_with_find_all
     @generator.select('p').find_all 'a' do |value, index|
       @generator << '(value.className == "welcome")'
@@ -546,7 +547,7 @@ return (value.className == "welcome");
 });
     EOS
   end
-  
+
   def test_collection_proxy_with_in_groups_of
     @generator.select('p').in_groups_of('a', 3)
     @generator.select('p').in_groups_of('a', 3, 'x')
@@ -555,13 +556,13 @@ var a = $$("p").inGroupsOf(3);
 var a = $$("p").inGroupsOf(3, "x");
     EOS
   end
-  
+
   def test_collection_proxy_with_each_slice
     @generator.select('p').each_slice('a', 3)
     @generator.select('p').each_slice('a', 3) do |group, index|
       group.reverse
     end
-      
+
     assert_equal <<-EOS.strip, @generator.to_s
 var a = $$("p").eachSlice(3);
 var a = $$("p").eachSlice(3, function(value, index) {
@@ -569,7 +570,7 @@ return value.reverse();
 });
     EOS
   end
-  
+
   def test_debug_rjs
     ActionView::Base.debug_rjs = true
     @generator['welcome'].replace_html 'Welcome'
@@ -577,7 +578,7 @@ return value.reverse();
   ensure
     ActionView::Base.debug_rjs = false
   end
-  
+
   def test_literal
     literal = @generator.literal("function() {}")
     assert_equal "function() {}", literal.to_json
@@ -588,7 +589,7 @@ return value.reverse();
     @generator.form.focus('my_field')
     assert_equal "Form.focus(\"my_field\");", @generator.to_s
   end
-  
+
   def test_call_with_block
     @generator.call(:before)
     @generator.call(:my_method) do |p|
@@ -601,7 +602,7 @@ return value.reverse();
     end
     assert_equal "before();\nmy_method(function() { $(\"one\").show();\n$(\"two\").hide(); });\nin_between();\nmy_method_with_arguments(true, \"hello\", function() { $(\"three\").visualEffect(\"highlight\"); });", @generator.to_s
   end
-  
+
   def test_class_proxy_call_with_block
     @generator.my_object.my_method do |p|
       p[:one].show
-- 
cgit v1.2.3