TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Changed early return for filter_matches as well as reassigning matches. Meddled with initialize in ArgumentFilter.

Browse Source
This commit is contained in:
Timm 2013-07-22 22:25:23 +02:00
parent 7ef141a7fc
commit 9893a2896b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_dispatch/testing/assertions/selector.rb
View File

@ -166,7 +166,7 @@ def assert_select(*args, &block)
matches = filter.root.css(selector)
content_mismatch = nil
filter_matches(matches, equals) do |mismatch|
matches = filter_matches(matches, equals) do |mismatch|
content_mismatch ||= mismatch
end
@ -295,10 +295,10 @@ def assert_select_email(&block)
protected
def filter_matches(matches, options)
match_with = options[:text] || options[:html]
return unless match_with
return matches unless match_with
text_matches = options.has_key?(:text)
matches.delete_if do |match|
matches.reject do |match|
# Preserve html markup with to_s if not matching text elements
content = text_matches ? match.text : match.to_s
@ -339,14 +339,14 @@ def response_from_page
class ArgumentFilter #:nodoc:
attr_accessor :root, :css_selector, :comparisons, :message
def initialize(selected, page, *args)
def initialize(selected, page, args)
@selected, @page = selected, page
# Start with optional element followed by mandatory selector.
@root = determine_root_from(args.shift)
@root = determine_root_from(args.first)
# First or second argument is the selector
selector = @css_selector_is_second_argument ? args.shift : args.first
selector = @css_selector_is_second_argument ? args.shift(2).last : args.shift
unless selector.is_a? String
raise ArgumentError, "Expecting a selector as the first argument"
end