add have to assert_selector and assert_no_selector for consistency.

This commit is contained in:
Amos King 2009-01-05 12:59:56 -06:00
parent f814b79ac1
commit ff00ae10ea
2 changed files with 8 additions and 8 deletions

View File

@ -36,14 +36,14 @@ module Webrat
# Asserts that the body of the response contains # Asserts that the body of the response contains
# the supplied selector # the supplied selector
def assert_selector(expected) def assert_have_selector(expected)
hs = HaveSelector.new(expected) hs = HaveSelector.new(expected)
raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body) raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body)
end end
# Asserts that the body of the response # Asserts that the body of the response
# does not contain the supplied string or regepx # does not contain the supplied string or regepx
def assert_no_selector(expected) def assert_have_no_selector(expected)
hs = HaveSelector.new(expected) hs = HaveSelector.new(expected)
raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body) raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body)
end end

View File

@ -118,24 +118,24 @@ describe Webrat::Matchers do
should_receive(:response_body).and_return @body should_receive(:response_body).and_return @body
require 'test/unit' require 'test/unit'
end end
describe "assert_selector" do describe "assert_have_selector" do
it "should pass when body contains the selection" do it "should pass when body contains the selection" do
assert_selector("div") assert_have_selector("div")
end end
it "should throw an exception when the body doesnt have matching selection" do it "should throw an exception when the body doesnt have matching selection" do
lambda {assert_selector("p")}.should raise_error(Test::Unit::AssertionFailedError) lambda {assert_have_selector("p")}.should raise_error(Test::Unit::AssertionFailedError)
end end
end end
describe "assert_not_selector" do describe "assert_have_not_selector" do
it "should pass when the body doesn't contan the selection" do it "should pass when the body doesn't contan the selection" do
assert_no_selector("p") assert_have_no_selector("p")
end end
it "should throw an exception when the body does contain the selection" do it "should throw an exception when the body does contain the selection" do
lambda {assert_no_selector("div")}.should raise_error(Test::Unit::AssertionFailedError) lambda {assert_have_no_selector("div")}.should raise_error(Test::Unit::AssertionFailedError)
end end
end end
end end