Revert "include Webrat::Matchers in selinium mode"

And Revert "getting assert_* to work with selenium"

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

lib/webrat/selenium/matchers.rb

@@ -59,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}"
@@ -70,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