Changeset 7437
- Timestamp:
- 09/09/07 23:03:32 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/assertions/dom_assertions.rb
r6470 r7437 3 3 module DomAssertions 4 4 # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes) 5 def assert_dom_equal(expected, actual, message ="")5 def assert_dom_equal(expected, actual, message = "") 6 6 clean_backtrace do 7 7 expected_dom = HTML::Document.new(expected).root 8 actual_dom = HTML::Document.new(actual).root8 actual_dom = HTML::Document.new(actual).root 9 9 full_message = build_message(message, "<?> expected to be == to\n<?>.", expected_dom.to_s, actual_dom.to_s) 10 10 11 assert_block(full_message) { expected_dom == actual_dom } 11 12 end … … 13 14 14 15 # The negated form of +assert_dom_equivalent+. 15 def assert_dom_not_equal(expected, actual, message ="")16 def assert_dom_not_equal(expected, actual, message = "") 16 17 clean_backtrace do 17 18 expected_dom = HTML::Document.new(expected).root 18 19 actual_dom = HTML::Document.new(actual).root 19 20 full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s) 21 20 22 assert_block(full_message) { expected_dom != actual_dom } 21 23 end trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb
r6894 r7437 67 67 elsif @selected 68 68 matches = [] 69 69 70 @selected.each do |selected| 70 71 subset = css_select(selected, HTML::Selector.new(arg.dup, args.dup)) … … 388 389 if arg.is_a?(Symbol) 389 390 rjs_type = arg 391 390 392 if rjs_type == :insert 391 393 arg = args.shift … … 434 436 end 435 437 end 438 436 439 if matches 437 440 if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type) … … 564 567 def response_from_page_or_rjs() 565 568 content_type = @response.content_type 569 566 570 if content_type && content_type =~ /text\/javascript/ 567 571 body = @response.body.dup 568 572 root = HTML::Node.new(nil) 573 569 574 while true 570 575 next if body.sub!(RJS_PATTERN_EVERYTHING) do |match| … … 576 581 break 577 582 end 583 578 584 root 579 585 else … … 593 599 unescaped 594 600 end 595 596 601 end 597 602 end
