Skip to content

Commit

Permalink
add have to assert_selector and assert_no_selector for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
adkron committed Jan 5, 2009
1 parent f814b79 commit ff00ae1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions lib/webrat/core/matchers/have_selector.rb
Expand Up @@ -36,14 +36,14 @@ def have_selector(expected, &block)

# Asserts that the body of the response contains
# the supplied selector
def assert_selector(expected)
def assert_have_selector(expected)
hs = HaveSelector.new(expected)
raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body)
end

# Asserts that the body of the response
# does not contain the supplied string or regepx
def assert_no_selector(expected)
def assert_have_no_selector(expected)
hs = HaveSelector.new(expected)
raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body)
end
Expand Down
12 changes: 6 additions & 6 deletions spec/public/matchers_spec.rb
Expand Up @@ -118,24 +118,24 @@
should_receive(:response_body).and_return @body
require 'test/unit'
end
describe "assert_selector" do
describe "assert_have_selector" do
it "should pass when body contains the selection" do
assert_selector("div")
assert_have_selector("div")
end

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

describe "assert_not_selector" do
describe "assert_have_not_selector" do
it "should pass when the body doesn't contan the selection" do
assert_no_selector("p")
assert_have_no_selector("p")
end

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
Expand Down

0 comments on commit ff00ae1

Please sign in to comment.