From 3589871de82c12123f62c80b4924d2696412065c Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Mon, 13 Mar 2006 02:11:59 +0000 Subject: Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. Set debug_rjs = true for the default development environment. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3856 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/mime_responds_test.rb | 2 +- actionpack/test/controller/new_render_test.rb | 2 +- actionpack/test/template/prototype_helper_test.rb | 44 +++++++++++++---------- 3 files changed, 28 insertions(+), 20 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 6fcaaf302d..94273cf4af 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -141,7 +141,7 @@ class MimeControllerTest < Test::Unit::TestCase @request.env["HTTP_ACCEPT"] = "text/javascript" get :using_defaults - assert_equal "$('body').visualEffect(\"highlight\");", @response.body + assert_equal '$("body").visualEffect("highlight");', @response.body @request.env["HTTP_ACCEPT"] = "application/xml" get :using_defaults diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb index 5bdb8ec7f8..961269da59 100644 --- a/actionpack/test/controller/new_render_test.rb +++ b/actionpack/test/controller/new_render_test.rb @@ -393,7 +393,7 @@ class NewRenderTest < Test::Unit::TestCase def test_enum_rjs_test get :enum_rjs_test assert_equal <<-EOS.strip, @response.body -$$('.product').each(function(value, index) { +$$(".product").each(function(value, index) { new Effect.Highlight(element,{}); new Effect.Highlight(value,{}); Sortable.create(value, {onUpdate:function(){new Ajax.Request('/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value)})}}); diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb index 253a8bac1c..e0746f62e6 100644 --- a/actionpack/test/template/prototype_helper_test.rb +++ b/actionpack/test/template/prototype_helper_test.rb @@ -230,31 +230,31 @@ Element.update("baz", "

This is a test

"); end def test_element_access - assert_equal %($('hello');), @generator['hello'] + assert_equal %($("hello");), @generator['hello'] end def test_element_proxy_one_deep @generator['hello'].hide - assert_equal %($('hello').hide();), @generator.to_s + assert_equal %($("hello").hide();), @generator.to_s end def test_element_proxy_assignment @generator['hello'].width = 400 - assert_equal %($('hello').width = 400;), @generator.to_s + assert_equal %($("hello").width = 400;), @generator.to_s end def test_element_proxy_two_deep @generator['hello'].hide("first").clean_whitespace - assert_equal %($('hello').hide("first").cleanWhitespace();), @generator.to_s + assert_equal %($("hello").hide("first").cleanWhitespace();), @generator.to_s end def test_select_access - assert_equal %($$('div.hello');), @generator.select('div.hello') + assert_equal %($$("div.hello");), @generator.select('div.hello') end def test_select_proxy_one_deep @generator.select('p.welcome b').first.hide - assert_equal %($$('p.welcome b').first().hide();), @generator.to_s + assert_equal %($$("p.welcome b").first().hide();), @generator.to_s end def test_visual_effect @@ -286,8 +286,8 @@ Element.update("baz", "

This is a test

"); @generator.select('p.welcome b').first.hide() @generator.select('p.welcome b').last.show() assert_equal <<-EOS.strip, @generator.to_s -$$('p.welcome b').first().hide(); -$$('p.welcome b').last().show(); +$$("p.welcome b").first().hide(); +$$("p.welcome b").last().show(); EOS end @@ -299,10 +299,10 @@ $$('p.welcome b').last().show(); @generator.visual_effect :highlight, value end assert_equal <<-EOS.strip, @generator.to_s -$$('p.welcome b').each(function(value, index) { +$$("p.welcome b").each(function(value, index) { value.removeClassName("selected"); }); -$$('p.welcome b').each(function(value, index) { +$$("p.welcome b").each(function(value, index) { new Effect.Highlight(value,{}); }); EOS @@ -312,10 +312,10 @@ new Effect.Highlight(value,{}); @generator.select('p').collect('a') { |para| para.show } @generator.select('p').collect { |para| para.hide } assert_equal <<-EOS.strip, @generator.to_s -var a = $$('p').collect(function(value, index) { +var a = $$("p").collect(function(value, index) { return value.show(); }); -$$('p').collect(function(value, index) { +$$("p").collect(function(value, index) { return value.hide(); }); EOS @@ -332,10 +332,10 @@ return value.hide(); end assert_equal <<-EOS.strip, @generator.to_s -var a = $$('p').grep(/^a/, function(value, index) { +var a = $$("p").grep(/^a/, function(value, index) { return (value.className == "welcome"); }); -var b = $$('p').grep(/b$/, function(value, index) { +var b = $$("p").grep(/b$/, function(value, index) { alert(value); return (value.className == "welcome"); }); @@ -352,10 +352,10 @@ return (value.className == "welcome"); end assert_equal <<-EOS.strip, @generator.to_s -var a = $$('p').inject([], function(memo, value, index) { +var a = $$("p").inject([], function(memo, value, index) { return (value.className == "welcome"); }); -var b = $$('p').inject(null, function(memo, value, index) { +var b = $$("p").inject(null, function(memo, value, index) { alert(memo); return (value.className == "welcome"); }); @@ -364,7 +364,7 @@ return (value.className == "welcome"); def test_collection_proxy_with_pluck @generator.select('p').pluck('a', 'className') - assert_equal %(var a = $$('p').pluck("className");), @generator.to_s + assert_equal %(var a = $$("p").pluck("className");), @generator.to_s end def test_collection_proxy_with_zip @@ -380,9 +380,17 @@ return array.reverse(); }); EOS end + + def test_debug_rjs + ActionView::Base.debug_rjs = true + @generator['welcome'].replace_html 'Welcome' + assert_equal "try {\n$(\"welcome\").update(\"Welcome\");\n} catch (e) { alert('RJS error:\\n\\n' + e.toString()); throw e }", @generator.to_s + ensure + ActionView::Base.debug_rjs = false + end def test_class_proxy @generator.form.focus('my_field') assert_equal "Form.focus(\"my_field\");", @generator.to_s end -end \ No newline at end of file +end -- cgit v1.2.3