From fe5d183e69619ab186142143e41c5f8a46af949b Mon Sep 17 00:00:00 2001
From: Amos King <amos.l.king@gmail.com>
Date: Fri, 2 Jan 2009 14:36:16 -0600
Subject: [PATCH] backed out will add in again as a different feature

---
 lib/webrat/selenium.rb          |  1 -
 lib/webrat/selenium/matchers.rb | 55 +++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb
index 968e882..3e8b999 100644
--- a/lib/webrat/selenium.rb
+++ b/lib/webrat/selenium.rb
@@ -88,7 +88,6 @@ module ActionController #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Selenium::Methods
-    include Webrat::Matchers
     include Webrat::Selenium::Matchers
   end
 end
diff --git a/lib/webrat/selenium/matchers.rb b/lib/webrat/selenium/matchers.rb
index 05944e8..a3d38f8 100644
--- a/lib/webrat/selenium/matchers.rb
+++ b/lib/webrat/selenium/matchers.rb
@@ -12,6 +12,18 @@ module Webrat
             response.selenium.is_element_present("xpath=#{@expected}")
           end
         end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match xpath #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match xpath #{@expected}:\n#{@document}"
+        end
       end
       
       def have_xpath(xpath)
@@ -28,6 +40,18 @@ module Webrat
             response.selenium.is_element_present("css=#{@expected}")
           end
         end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match selector #{@expected}:\n#{@document}"
+        end
       end
       
       def have_selector(content)
@@ -35,6 +59,10 @@ module Webrat
       end
       
       class HasContent #:nodoc:
+        def initialize(content)
+          @content = content
+        end
+        
         def matches?(response)
           if @content.is_a?(Regexp)
             text_finder = "regexp:#{@content.source}"
@@ -46,6 +74,33 @@ module Webrat
             response.selenium.is_text_present(text_finder)
           end
         end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected the following element's content to #{content_message}:\n#{@element}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected the following element's content to not #{content_message}:\n#{@element}"
+        end
+
+        def content_message
+          case @content
+          when String
+            "include \"#{@content}\""
+          when Regexp
+            "match #{@content.inspect}"
+          end
+        end
+      end
+
+      # Matches the contents of an HTML document with
+      # whatever string is supplied
+      def contain(content)
+        HasContent.new(content)
       end
       
     end