remove duplicated code from the Has Content matchers in selenium matchers file.

This commit is contained in:
Amos King 2009-01-09 22:14:12 -06:00
parent fbb74a5a98
commit 10b31be511

View File

@ -59,10 +59,6 @@ module Webrat
end end
class HasContent #:nodoc: class HasContent #:nodoc:
def initialize(content)
@content = content
end
def matches?(response) def matches?(response)
if @content.is_a?(Regexp) if @content.is_a?(Regexp)
text_finder = "regexp:#{@content.source}" text_finder = "regexp:#{@content.source}"
@ -74,33 +70,6 @@ module Webrat
response.selenium.is_text_present(text_finder) response.selenium.is_text_present(text_finder)
end end
end end
# ==== Returns
# String:: The failure message.
def failure_message
"expected the following element's content to #{content_message}:\n#{@element}"
end
# ==== Returns
# String:: The failure message to be displayed in negative matches.
def negative_failure_message
"expected the following element's content to not #{content_message}:\n#{@element}"
end
def content_message
case @content
when String
"include \"#{@content}\""
when Regexp
"match #{@content.inspect}"
end
end
end
# Matches the contents of an HTML document with
# whatever string is supplied
def contain(content)
HasContent.new(content)
end end
end end