@@ -19,4 +19,10 @@ Usage: assert_rjs :show, "post_1", "post_2", "post_3" assert_rjs :sortable, 'sortable_item' assert_rjs :toggle, "post_1", "post_2", "post_3" - assert_rjs :visual_effect, :highlight, "posts", :duration => '1.0' + assert_rjs :visual_effect, :highlight, "posts", :duration => '1.0' + +For the square bracket syntax (page['some_id'].toggle) use :page followed by the id and then subsequent method calls. Assignment requires a '=' at the end of the method name followed by the value. + + assert_rjs :page, 'some_id', :toggle + assert_rjs :page, 'some_id', :style, :color=, 'red' + README @@ -85,8 +85,31 @@ module Arts end end + # To deal with [] syntax. I hate JavaScriptProxy so.. SO very much + def assert_rjs_page(*args) + content = build_method_chain!(args) + assert_match Regexp.new(Regexp.escape(content)), @response.body, + "Content did not include:\n #{content.to_s}" + end + protected + def build_method_chain!(args) + content = create_generator.send(:[], args.shift) # start $('some_id').... + + while !args.empty? + if (method = args.shift.to_s) =~ /(.*)=$/ + content = content.__send__(method, args.shift) + break + else + content = content.__send__(method) + content = content.__send__(:function_chain).first if args.empty? + end + end + + content + end + def lined_response @response.body.split("\n") end @@ -107,4 +130,4 @@ module Arts return create_generator.send(:arguments_for_call, args) end end -end +end \ No newline at end of file lib/arts.rb @@ -102,6 +102,18 @@ class ArtsController < ActionController::Base end end + def page_with_one_chained_method + render :update do |page| + page['some_id'].toggle + end + end + + def page_with_assignment + render :update do |page| + page['some_id'].style.color = 'red' + end + end + def rescue_errors(e) raise e end end @@ -358,4 +370,33 @@ class ArtsTest < Test::Unit::TestCase assert_no_rjs :visual_effect, :highlight, "posts", :duration => '1.0' end end + + # [] support + + def test_page_with_one_chained_method + get :page_with_one_chained_method + assert_nothing_raised do + assert_rjs :page, 'some_id', :toggle + assert_no_rjs :page, 'some_other_id', :toggle + end + + assert_raises(Test::Unit::AssertionFailedError) do + assert_rjs :page, 'some_other_id', :toggle + assert_no_rjs :page, 'some_id', :toggle + end + end + + def test_page_with_assignment + get :page_with_assignment + + assert_nothing_raised do + assert_rjs :page, 'some_id', :style, :color=, 'red' + assert_no_rjs :page, 'some_id', :color=, 'red' + end + + assert_raises(Test::Unit::AssertionFailedError) do + assert_no_rjs :page, 'some_id', :style, :color=, 'red' + assert_rjs :page, 'some_other_id', :style, :color=, 'red' + end + end end test/arts_test.rb dfadf461450207e1095cc656a9703d05546da149 kevinc kevinc@fc021c06-de14-0410-8c5a-e664d767796e http://github.com/richpoirier/arts/commit/60e9a69077b37127b1d575dd2369f2071ac6d8f5 60e9a69077b37127b1d575dd2369f2071ac6d8f5 2006-09-15T18:53:15-07:00 2006-09-15T18:53:15-07:00 Allow for square bracket syntax. 8e99e3963617acf652a6e2ae96149957abcc8faf kevinc kevinc@fc021c06-de14-0410-8c5a-e664d767796e