Merge pull request #27 from rails/special-body

rafaelfranca · rafaelfranca · commit 0500ae5593a0 · 2014-11-18T18:38:27.000-02:00
Fix #26 by running assertion when we aren't testing for a body.
diff --git a/lib/rails/dom/testing/assertions/selector_assertions.rb b/lib/rails/dom/testing/assertions/selector_assertions.rb
@@ -60,11 +60,8 @@ def css_select(*args)
           raise ArgumentError, "you at least need a selector argument" if args.empty?
 
           root = args.size == 1 ? document_root_element : args.shift
-          selector = args.first
 
-          root.css(selector).tap do |matches|
-            return nodeset(root).css(selector) if matches.empty?
-          end
+          nodeset(root).css(args.first)
         rescue Nokogiri::CSS::SyntaxError => e
           ActiveSupport::Deprecation.warn("The assertion was not run because of an invalid css selector.\n#{e}", caller(2))
           return
@@ -167,7 +164,13 @@ def css_select(*args)
         def assert_select(*args, &block)
           @selected ||= nil
 
-          selector = HTMLSelector.new(args, self, @selected)
+          selector = HTMLSelector.new(args, @selected) { nodeset document_root_element }
+
+          if selecting_no_body?(selector)
+            assert true
+            return
+          end
+
           selector.select.tap do |matches|
             assert_size_match!(matches.size, selector.tests, selector.selector, selector.message)
 
@@ -258,14 +261,14 @@ def assert_select_email(&block)
           end
         end
 
-        def document_root_element
-          raise NotImplementedError, 'Implementing document_root_element makes ' \
-            'assert_select work without needing to specify an element to select from.'
-        end
-
         private
           include CountDescripable
 
+          def document_root_element
+            raise NotImplementedError, 'Implementing document_root_element makes ' \
+              'assert_select work without needing to specify an element to select from.'
+          end
+
           # +equals+ must contain :minimum, :maximum and :count keys
           def assert_size_match!(size, equals, css_selector, message = nil)
             min, max, count = equals[:minimum], equals[:maximum], equals[:count]
@@ -279,6 +282,12 @@ def assert_size_match!(size, equals, css_selector, message = nil)
             end
           end
 
+          def selecting_no_body?(html_selector)
+            # Nokogiri gives the document a body element. Which means we can't
+            # run an assertion expecting there to not be a body.
+            html_selector.selector == 'body' && html_selector.tests[:count] == 0
+          end
+
           def nest_selection(selection)
             # Set @selected to allow nested assert_select.
             # Can be nested several levels deep.
diff --git a/lib/rails/dom/testing/assertions/selector_assertions/html_selector.rb b/lib/rails/dom/testing/assertions/selector_assertions/html_selector.rb
@@ -4,9 +4,9 @@
 class HTMLSelector #:nodoc:
   attr_reader :selector, :tests, :message
 
-  def initialize(values, rootable, previous_selection = nil)
+  def initialize(values, previous_selection = nil, &root_fallback)
     @values = values
-    @root = extract_root(rootable, previous_selection)
+    @root = extract_root(previous_selection, root_fallback)
     @selector = extract_selector
     @tests = extract_equality_tests
     @message = @values.shift
@@ -50,7 +50,7 @@ def filter(matches)
     Nokogiri::XML::NodeSet.new(matches.document, remaining)
   end
 
-  def extract_root(rootable, previous_selection)
+  def extract_root(previous_selection, root_fallback)
     possible_root = @values.first
 
     if possible_root == nil
@@ -63,7 +63,7 @@ def extract_root(rootable, previous_selection)
     elsif previous_selection
       previous_selection
     else
-      rootable.document_root_element
+      root_fallback.call
     end
   end
 
diff --git a/test/selector_assertions_test.rb b/test/selector_assertions_test.rb
@@ -280,12 +280,18 @@ def test_feed_item_encoded
   end
 
   def test_body_not_present_in_empty_document
-    render_html ''
+    render_html '<div></div>'
     assert_select 'body', 0
   end
 
-  def document_root_element
-    @html_document
+  def test_body_class_can_be_tested
+    render_html '<body class="foo"></body>'
+    assert_select '.foo'
+  end
+
+  def test_body_class_can_be_tested_with_html
+    render_html '<html><body class="foo"><div></div></body></html>'
+    assert_select '.foo'
   end
 
   protected
@@ -299,9 +305,13 @@ def render_xml(xml)
 
     def fake_render(content_type, content)
       @html_document = if content_type == :xml
-        Nokogiri::XML::DocumentFragment.parse(content)
+        Nokogiri::XML::Document.parse(content)
       else
-        Nokogiri::HTML::DocumentFragment.parse(content)
+        Nokogiri::HTML::Document.parse(content)
       end
     end
+
+    def document_root_element
+      @html_document.root
+    end
 end
