kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

use assert_equal and assert_operator

Browse source
This commit is contained in:
Aaron Patterson 2012-01-06 11:48:32 -08:00
parent a0dc9cae88
commit 6548fc6617
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
actionpack/lib/action_dispatch/testing/assertions/selector.rb
View file

@ -270,7 +270,7 @@ module ActionDispatch
end end
text.strip! unless NO_STRIP.include?(match.name) text.strip! unless NO_STRIP.include?(match.name)
unless match_with.is_a?(Regexp) ? (text =~ match_with) : (text == match_with.to_s) unless match_with.is_a?(Regexp) ? (text =~ match_with) : (text == match_with.to_s)
content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, text) content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, text)
true true
end end
end end
@ -279,7 +279,7 @@ module ActionDispatch
html = match.children.map(&:to_s).join html = match.children.map(&:to_s).join
html.strip! unless NO_STRIP.include?(match.name) html.strip! unless NO_STRIP.include?(match.name)
unless match_with.is_a?(Regexp) ? (html =~ match_with) : (html == match_with.to_s) unless match_with.is_a?(Regexp) ? (html =~ match_with) : (html == match_with.to_s)
content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, html) content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, html)
true true
end end
end end
@ -289,12 +289,15 @@ module ActionDispatch
message ||= content_mismatch if matches.empty? message ||= content_mismatch if matches.empty?
# Test minimum/maximum occurrence. # Test minimum/maximum occurrence.
min, max, count = equals[:minimum], equals[:maximum], equals[:count] min, max, count = equals[:minimum], equals[:maximum], equals[:count]
# FIXME: minitest provides messaging when we use assert_operator,
# so is this custom message really needed?
message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.) message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.)
if count if count
assert matches.size == count, message assert_equal matches.size, count, message
else else
assert matches.size >= min, message if min assert_operator matches.size, :>=, min, message if min
assert matches.size <= max, message if max assert_operator matches.size, :<=, max, message if max
end end
# If a block is given call that block. Set @selected to allow # If a block is given call that block. Set @selected to allow