@@ -168,6 +168,8 @@ module Merb::Test::Rspec::ViewMatchers class HasTag + attr_accessor :outer_has_tag, :inner_has_tag + # ==== Parameters # tag<~to_s>:: The tag to look for. # attributes<Hash>:: Attributes for the tag (see below). @@ -197,8 +199,13 @@ module Merb::Test::Rspec::ViewMatchers unless @blk.nil? !@document.search(selector).select do |ele| - @blk.call ele - true + begin + @blk.call ele + true + rescue Spec::Expectations::ExpectationNotMetError + @error_message = "#{tag_for_error}:\n" + $!.message + false + end end.empty? else !@document.search(selector).empty? @@ -208,12 +215,10 @@ module Merb::Test::Rspec::ViewMatchers # ==== Returns # String:: The complete selector for element queries. def selector - @selector = "//#{@tag}#{id_selector}#{class_selector}" - @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join + @selector = @outer_has_tag ? @outer_has_tag.selector : '' - @selector << @inner_has_tag.selector unless @inner_has_tag.nil? - - @selector + @selector << "//#{@tag}#{id_selector}#{class_selector}" + @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join end # ==== Returns @@ -231,45 +236,38 @@ module Merb::Test::Rspec::ViewMatchers # ==== Returns # String:: The failure message. def failure_message - "expected following output to contain a #{tag_for_error} tag:\n#{@document}" + @error_message || "expected following output to contain a #{tag_for_error} tag:\n#{@document}" end # ==== Returns # String:: The failure message to be displayed in negative matches. def negative_failure_message - "expected following output to omit a #{tag_for_error} tag:\n#{@document}" + @error_message || "expected following output to omit a #{tag_for_error} tag:\n#{@document}" end # ==== Returns # String:: The tag used in failure messages. def tag_for_error - "#{inner_failure_message}<#{@tag}#{id_for_error}#{class_for_error}#{attributes_for_error}>" - end - - # ==== Returns - # String:: - # The failure message to be displayed in negative matches within the - # have_tag block. - def inner_failure_message - "#{@inner_has_tag.tag_for_error} tag within a " unless @inner_has_tag.nil? + result = "#{@tag}#{id_for_error}#{class_for_error}#{attributes_for_error}" + inner_has_tag ? result << " > #{inner_has_tag.tag_for_error}" : result end # ==== Returns # String:: ID for the error tag. def id_for_error - " id=\"#{@id}\"" unless @id.nil? + "##{@id}" unless @id.nil? end # ==== Returns # String:: Class for the error tag. def class_for_error - " class=\"#{@class}\"" unless @class.nil? + ".#{@class}" unless @class.nil? end # ==== Returns # String:: Class for the error tag. def attributes_for_error - @attributes.map{|a,v| " #{a}=\"#{v}\""}.join + @attributes.map{|a,v| "[#{a}=\"#{v}\"]"}.join end # Search for a child tag within a have_tag block. @@ -279,6 +277,7 @@ module Merb::Test::Rspec::ViewMatchers # attributes<Hash>:: Attributes for the tag (see below). def with_tag(name, attrs={}) @inner_has_tag = HasTag.new(name, attrs) + @inner_has_tag.outer_has_tag = self end end lib/merb-core/test/matchers/view_matchers.rb 42da35e9861d0ca0ef228a017316a31d76cf0e29 Michael Holub michael.holub@gmail.com http://github.com/wycats/merb-core/commit/1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118 1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118 2008-10-11T21:30:50-07:00 2008-10-10T18:56:39-07:00 #329 bug fix Signed-off-by: Michael S. Klishin <michael@novemberain.com> 0935c21c912e5641c3abf0ec168bf014d75a7ea2 Michael S. Klishin michael@novemberain.com