0
@@ -47,6 +47,7 @@ module RspecHpricotMatchers
0
         end
0
       end
0
 
0
+      @actual_count = matched_elements.length
0
       if @options[:count]
0
         return false unless @options[:count] === matched_elements.length
0
       end
0
@@ -61,13 +62,17 @@ module RspecHpricotMatchers
0
     end
0
 
0
     def failure_message
0
-      with_inner_text = @inner_text ? " with inner text #{@inner_text.inspect}" : ""
0
-      "expected #{@actual.inspect} to have tag #{@selector.inspect}#{with_inner_text}, but did not"
0
+      with_inner_text   = @inner_text ? " with inner text #{@inner_text.inspect}" : ""
0
+      explanation       = @actual_count ? "but found #{@actual_count}" : "but did not"
0
+      count_explanation = @options[:count] ? "#{@options[:count]} elements matching" : "an element matching"
0
+      "expected\n#{@hdoc.to_s}\nto have #{count_explanation} #{@selector.inspect}#{with_inner_text}, #{explanation}"
0
     end
0
 
0
     def negative_failure_message
0
       with_inner_text = @inner_text ? " with inner text #{@inner_text.inspect}" : ""
0
-      "did not expect #{@actual.inspect} to have tag #{@selector.inspect}#{with_inner_text}, but did"
0
+      explanation     = @actual_count ? "but found #{@actual_count}" : "but did"
0
+      count_explanation = @options[:count] ? "#{@options[:count]} elements matching" : "an element matching"
0
+      "did not expect\n#{@hdoc.to_s}\nto have #{count_explanation} #{@selector.inspect}#{with_inner_text}, #{explanation}"
0
     end
0
   end
0
 

0
@@ -168,4 +168,31 @@ describe 'have_tag with counts' do
0
       ul.should have_tag('li', /foo/i, :count => 2)
0
     end
0
   end
0
+
0
+  it "should include the actual number of elements matched in the failure message" do
0
+    lambda {
0
+      @html.should have_tag('li', :count => 3)
0
+    }.should raise_error(SpecFailed, /found 4/)
0
+    lambda {
0
+      @html.should have_tag('li', :count => 5)
0
+    }.should raise_error(SpecFailed, /found 4/)
0
+  end
0
+
0
+  it "should include the actual number of elements matched in the negative failure message" do
0
+    lambda {
0
+      @html.should_not have_tag('li', :count => 4)
0
+    }.should raise_error(SpecFailed, /found 4/)
0
+  end
0
+
0
+  it "should include the expected number of elements in the failure message" do
0
+    lambda {
0
+      @html.should have_tag('li', :count => 2)
0
+    }.should raise_error(SpecFailed, /to have 2 elements matching/)
0
+  end
0
+
0
+  it "should include the expected number of elements in the negative failure message" do
0
+    lambda {
0
+      @html.should_not have_tag('li', :count => 4)
0
+    }.should raise_error(SpecFailed, /to have 4 elements matching/)
0
+  end
0
 end