Should not bang!

This commit is contained in:
Jonas Nicklas 2012-07-09 13:39:57 +02:00
parent 6bccbad114
commit bd69a66aff
3 changed files with 7 additions and 7 deletions

View File

@ -33,12 +33,12 @@ module Capybara
# @return [Boolean] If the expression exists
#
def has_selector?(*args)
assert_selector!(*args)
assert_selector(*args)
rescue Capybara::ExpectationNotMet
return false
end
def assert_selector!(*args)
def assert_selector(*args)
synchronize do
result = all(*args)
result.matches_count? or raise Capybara::ExpectationNotMet, result.failure_message
@ -55,12 +55,12 @@ module Capybara
# @return [Boolean]
#
def has_no_selector?(*args)
assert_no_selector!(*args)
assert_no_selector(*args)
rescue Capybara::ExpectationNotMet
return false
end
def assert_no_selector!(*args)
def assert_no_selector(*args)
synchronize do
result = all(*args)
result.matches_count? and raise Capybara::ExpectationNotMet, result.negative_failure_message

View File

@ -6,11 +6,11 @@ module Capybara
end
def matches?(actual)
wrap(actual).assert_selector!(*@args)
wrap(actual).assert_selector(*@args)
end
def does_not_match?(actual)
wrap(actual).assert_no_selector!(*@args)
wrap(actual).assert_no_selector(*@args)
end
def description

View File

@ -35,7 +35,7 @@ module Capybara
:has_unchecked_field?, :has_no_table?, :has_table?, :unselect,
:has_select?, :has_no_select?, :has_selector?, :has_no_selector?,
:click_on, :has_no_checked_field?, :has_no_unchecked_field?, :query,
:assert_selector!, :assert_no_selector!
:assert_selector, :assert_no_selector
]
SESSION_METHODS = [
:body, :html, :current_url, :current_host, :evaluate_script, :source,