Work on moving more failure message stuff to Query

lib/capybara/node/finders.rb

@@ -139,7 +139,7 @@ module Capybara
 
       def raise_find_error(*args)
         query = Capybara::Query.new(*args)
-        raise Capybara::ElementNotFound, query.failure_message(self)
+        raise Capybara::ElementNotFound, query.failure_message(:find, self)
       end
 
       def find_in_base(query, xpath)

lib/capybara/query.rb

@@ -28,15 +28,25 @@ module Capybara
       end
     end
 
-    def failure_message(node)
+    def failure_message(type, node)
       message = selector.failure_message.call(node, self) if selector.failure_message
       message ||= options[:message]
-      message ||= "Unable to find #{name} #{locator.inspect}"
+      if type == :assert
+        message ||= "expected #{description} to return something"
+      else
+        message ||= "Unable to find #{description}"
+      end
       message
     end
 
     def name; selector.name; end
 
+    def description
+      @description = "#{name} #{locator.inspect}"
+      @description << " with text #{options[:text].inspect}" if options[:text]
+      @description
+    end
+
     def matches_filters?(node)
       return false if options[:text]      and not node.text.match(options[:text])
       return false if options[:visible]   and not node.visible?

lib/capybara/rspec/matchers.rb

@@ -16,25 +16,15 @@ module Capybara
       end
 
       def failure_message_for_should
-        if normalized.failure_message
+        query.failure_message(:assert, @actual)
-          normalized.failure_message.call(@actual, normalized)
-        else
-          "expected #{selector_name} to return something"
-        end
       end
 
       def failure_message_for_should_not
-        "expected #{selector_name} not to return anything"
+        "expected #{query.description} not to return anything"
       end
 
       def description
-        "has #{selector_name}"
+        "has #{query.description}"
-      end
-
-      def selector_name
-        name = "#{normalized.name} #{normalized.locator.inspect}"
-        name << " with text #{normalized.options[:text].inspect}" if normalized.options[:text]
-        name
       end
 
       def wrap(actual)
@@ -45,8 +35,8 @@ module Capybara
         end
       end
 
-      def normalized
+      def query
-        @normalized ||= Capybara::Selector.normalize(*@args)
+        @query ||= Capybara::Query.new(*@args)
       end
     end