github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding :count option to have_tag

Browse Source
This commit is contained in:
Bryan Helmkamp 2009-02-15 19:41:44 -05:00
parent 932fdab884
commit 17a8bc7b66
3 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/webrat/core/matchers/have_tag.rb
View File

@ -15,6 +15,19 @@ module Webrat
"expected following output to omit a #{tag_inspect}:\n#{@document}"
end
def matches?(stringlike, &block)
@block ||= block
matched = matches(stringlike)
options = @expected.last.dup
if options[:count]
matched.size == options[:count] && (!@block || @block.call(matched))
else
matched.any? && (!@block || @block.call(matched))
end
end
def tag_inspect
options = @expected.last.dup
content = options.delete(:content)
@ -38,7 +51,7 @@ module Webrat
selector = @expected.first.to_s
options.each do |key, value|
next if key == :content
next if [:content, :count].include?(key)
selector << "[#{key}='#{value}']"
end
@ -56,6 +69,7 @@ module Webrat
elsif options[:content]
q << "[contains(., '#{options[:content]}')]"
end
q
end
end

21
lib/webrat/core/matchers/have_xpath.rb
View File

@ -12,15 +12,19 @@ module Webrat
def matches?(stringlike, &block)
@block ||= block
matched = matches(stringlike)
matched.any? && (!@block || @block.call(matched))
end
def matches(stringlike)
if Webrat.configuration.parse_with_nokogiri?
matches_nokogiri?(stringlike)
nokogiri_matches(stringlike)
else
matches_rexml?(stringlike)
rexml_matches(stringlike)
end
end
def matches_rexml?(stringlike)
def rexml_matches(stringlike)
if REXML::Node === stringlike || Array === stringlike
@query = query.map { |q| q.gsub(%r'//', './') }
else
@ -29,18 +33,16 @@ module Webrat
@document = Webrat.rexml_document(stringlike)
matched = @query.map do |q|
@query.map do |q|
if @document.is_a?(Array)
@document.map { |d| REXML::XPath.match(d, q) }
else
REXML::XPath.match(@document, q)
end
end.flatten.compact
matched.any? && (!@block || @block.call(matched))
end
def matches_nokogiri?(stringlike)
def nokogiri_matches(stringlike)
if Nokogiri::XML::NodeSet === stringlike
@query = query.map { |q| q.gsub(%r'//', './') }
else
@ -48,8 +50,7 @@ module Webrat
end
@document = Webrat::XML.document(stringlike)
matched = @document.xpath(*@query)
matched.any? && (!@block || @block.call(matched))
@document.xpath(*@query)
end
def query

22
spec/public/matchers_spec.rb
View File

@ -178,19 +178,29 @@ describe Webrat::Matchers do
end
it "should be able to specify the content of the tag" do
@body.should have_tag("div", :content => "hello, world!")
@body.should have_tag("div", :content => "hello, world!")
end
it "should be able to specify the content of the tag with double quotes in it" do
@body.should have_tag("h2", :content => 'Welcome "Bryan"')
@body.should have_tag("h2", :content => 'Welcome "Bryan"')
end
it "should be able to specify the content of the tag with single quotes in it" do
@body.should have_tag("h3", :content => "Welcome 'Bryan'")
@body.should have_tag("h3", :content => "Welcome 'Bryan'")
end
it "should be able to specify the content of the tag with both kinds of quotes" do
@body.should have_tag("h4", :content => "Welcome 'Bryan\"")
@body.should have_tag("h4", :content => "Welcome 'Bryan\"")
end
it "should be able to specify the number of occurences of the tag" do
@body.should have_tag("li", :count => 2)
end
it "should not match if the count is wrong" do
lambda {
@body.should have_tag("li", :count => 3)
}.should raise_error(Spec::Expectations::ExpectationNotMetError)
end
it "should be able to specify the attributes of the tag" do
@ -226,10 +236,10 @@ describe Webrat::Matchers do
end
it "should work with items that have multiple child nodes" do
@body.should have_tag("ul") { |n|
@body.should have_tag("ul") do |n|
n.should have_tag("li", :content => "First")
n.should have_tag("li", :content => "Second")
}
end
end
describe "asserts for tags," do