Merge pull request #20 from rails/body-refute-fix

Don't envelop fragments in documents.

Author: rafaelfranca

lib/rails/dom/testing/assertions/selector_assertions.rb

@@ -62,7 +62,9 @@ def css_select(*args)
           selector = args.first
 
           begin
-            nodeset(root).css(selector)
+            root.css(selector).tap do |matches|
+              return nodeset(root).css(selector) if matches.empty?
+            end
           rescue Nokogiri::CSS::SyntaxError => e
             ActiveSupport::Deprecation.warn("The assertion was not run because of an invalid css selector.\n#{e}", caller(2))
             return
@@ -308,7 +310,7 @@ def determine_root_from(args, previous_selection = nil)
             elsif previous_selection
               previous_selection
             else
-              nodeset document_root_element
+              document_root_element
             end
           end
 

test/selector_assertions_test.rb

@@ -279,6 +279,11 @@ def test_feed_item_encoded
     end
   end
 
+  def test_body_not_present_in_empty_document
+    render_html ''
+    assert_select 'body', 0
+  end
+
   protected
     def render_html(html)
       fake_render(:html, html)
@@ -290,13 +295,13 @@ def render_xml(xml)
 
     def fake_render(content_type, content)
       @html_document = if content_type == :xml
-        Nokogiri::XML::Document.parse(content)
+        Nokogiri::XML::DocumentFragment.parse(content)
       else
-        Nokogiri::HTML::Document.parse(content)
+        Nokogiri::HTML::DocumentFragment.parse(content)
       end
     end
 
     def document_root_element
-      @html_document.root
+      @html_document
     end
 end