Pulling :content functionality up from have_selector into have_xpath

brynary · Feb 24, 2009 · 1625e3e · 1625e3e
1 parent a688c28
commit 1625e3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/webrat/core/matchers/have_selector.rb b/lib/webrat/core/matchers/have_selector.rb
@@ -43,13 +43,7 @@ def query
           selector << "[#{key}='#{value}']"
         end
 
-        q = Nokogiri::CSS::Parser.parse(selector).map { |ast| ast.to_xpath }.first
-
-        if options[:content]
-          q << "[contains(., #{xpath_escape(options[:content])})]"
-        end
-
-        q
+        Nokogiri::CSS::Parser.parse(selector).map { |ast| ast.to_xpath }.first
       end
 
       def xpath_escape(string)

diff --git a/lib/webrat/core/matchers/have_xpath.rb b/lib/webrat/core/matchers/have_xpath.rb
@@ -55,6 +55,10 @@ def nokogiri_matches(stringlike)
           @query = query
         end
 
+        if @options[:content]
+          query << "[contains(., #{xpath_escape(@options[:content])})]"
+        end
+
         @document = Webrat::XML.document(stringlike)
         @document.xpath(*@query)
       end