change assert_tag and assert_no_tag to assert_have_tag and assert_no_tag so it won't conflict with rails and so that it will be more like the matchers.
This commit is contained in:
parent
ff00ae10ea
commit
021f197abc
@ -55,14 +55,14 @@ module Webrat
|
|||||||
|
|
||||||
# Asserts that the body of the response contains
|
# Asserts that the body of the response contains
|
||||||
# the supplied tag with the associated selectors
|
# the supplied tag with the associated selectors
|
||||||
def assert_tag(name, attributes = {})
|
def assert_have_tag(name, attributes = {})
|
||||||
ht = HaveTag.new([name, attributes])
|
ht = HaveTag.new([name, attributes])
|
||||||
raise Test::Unit::AssertionFailedError.new(ht.failure_message) unless ht.matches?(response_body)
|
raise Test::Unit::AssertionFailedError.new(ht.failure_message) unless ht.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_tag(name, attributes = {})
|
def assert_have_no_tag(name, attributes = {})
|
||||||
ht = HaveTag.new([name, attributes])
|
ht = HaveTag.new([name, attributes])
|
||||||
raise Test::Unit::AssertionFailedError.new(ht.negative_failure_message) if ht.matches?(response_body)
|
raise Test::Unit::AssertionFailedError.new(ht.negative_failure_message) if ht.matches?(response_body)
|
||||||
end
|
end
|
||||||
|
@ -192,40 +192,40 @@ 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_tag" do
|
describe "assert_have_tag" do
|
||||||
it "should pass when body contains the tag" do
|
it "should pass when body contains the tag" do
|
||||||
assert_tag("div")
|
assert_have_tag("div")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should pass when finding with additional selectors" do
|
it "should pass when finding with additional selectors" do
|
||||||
assert_tag("div", :class => "inner")
|
assert_have_tag("div", :class => "inner")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
it "should throw an exception when the body doesnt have matching tag" do
|
it "should throw an exception when the body doesnt have matching tag" do
|
||||||
lambda {assert_tag("p")}.should raise_error(Test::Unit::AssertionFailedError)
|
lambda {assert_have_tag("p")}.should raise_error(Test::Unit::AssertionFailedError)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should throw an exception when the body doens't have a tag matching the additional selector" do
|
it "should throw an exception when the body doens't have a tag matching the additional selector" do
|
||||||
lambda {assert_tag("div", :class => "nope")}.should raise_error(Test::Unit::AssertionFailedError)
|
lambda {assert_have_tag("div", :class => "nope")}.should raise_error(Test::Unit::AssertionFailedError)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "assert_no_tag" do
|
describe "assert_have_no_tag" do
|
||||||
it "should pass when the body doesn't contan the tag" do
|
it "should pass when the body doesn't contan the tag" do
|
||||||
assert_no_tag("p")
|
assert_have_no_tag("p")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should pass when the body doesn't contain the tag due to additional selectors missing" do
|
it "should pass when the body doesn't contain the tag due to additional selectors missing" do
|
||||||
assert_no_tag("div", :class => "nope")
|
assert_have_no_tag("div", :class => "nope")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should throw an exception when the body does contain the tag" do
|
it "should throw an exception when the body does contain the tag" do
|
||||||
lambda {assert_no_tag("div")}.should raise_error(Test::Unit::AssertionFailedError)
|
lambda {assert_have_no_tag("div")}.should raise_error(Test::Unit::AssertionFailedError)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should throw an exception when the body contains the tag with additional selectors" do
|
it "should throw an exception when the body contains the tag with additional selectors" do
|
||||||
lambda {assert_no_tag("div", :class => "inner")}.should raise_error(Test::Unit::AssertionFailedError)
|
lambda {assert_have_no_tag("div", :class => "inner")}.should raise_error(Test::Unit::AssertionFailedError)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user