oops didn't notice I was using the wrong matchers. Matchers now using Selenium mode.
This commit is contained in:
parent
928b224237
commit
d4008ebc06
|
@ -30,6 +30,16 @@ module Webrat
|
||||||
HaveXpath.new(xpath)
|
HaveXpath.new(xpath)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def assert_have_xpath(expected)
|
||||||
|
hs = HaveXpath.new(expected)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
|
def assert_have_no_xpath(expected)
|
||||||
|
hs = HaveXpath.new(expected)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
class HaveSelector
|
class HaveSelector
|
||||||
def initialize(expected)
|
def initialize(expected)
|
||||||
@expected = expected
|
@expected = expected
|
||||||
|
@ -58,6 +68,20 @@ module Webrat
|
||||||
HaveSelector.new(content)
|
HaveSelector.new(content)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Asserts that the body of the response contains
|
||||||
|
# the supplied selector
|
||||||
|
def assert_have_selector(expected)
|
||||||
|
hs = HaveSelector.new(expected)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
|
# Asserts that the body of the response
|
||||||
|
# does not contain the supplied string or regepx
|
||||||
|
def assert_have_no_selector(expected)
|
||||||
|
hs = HaveSelector.new(expected)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
class HasContent #:nodoc:
|
class HasContent #:nodoc:
|
||||||
def initialize(content)
|
def initialize(content)
|
||||||
@content = content
|
@content = content
|
||||||
|
@ -103,6 +127,20 @@ module Webrat
|
||||||
HasContent.new(content)
|
HasContent.new(content)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Asserts that the body of the response contain
|
||||||
|
# the supplied string or regexp
|
||||||
|
def assert_contain(content)
|
||||||
|
hc = HasContent.new(content)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hc.failure_message) unless hc.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
|
# Asserts that the body of the response
|
||||||
|
# does not contain the supplied string or regepx
|
||||||
|
def assert_not_contain(content)
|
||||||
|
hc = HasContent.new(content)
|
||||||
|
raise Test::Unit::AssertionFailedError.new(hc.negative_failure_message) if hc.matches?(response)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
Loading…
Reference in New Issue