rails-dom-testing 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65398ee552b3e2bb13fc42eccfff4620cac17bed
-  data.tar.gz: 2765f5b8e4262a28e4c9e04f7892f75e8dd7b6ee
+  metadata.gz: 6a29feb41b5ab1bec20c3f358c1ff848f66db985
+  data.tar.gz: beaf92796b4e2d31e4e4b58515f48e8ba400344a
 SHA512:
-  metadata.gz: 9295246ea1524127de19fe80e3428d3828606fbadcd092b5e65270bbe803d804cb9757a41438e71c568251fb9a1535b6d811951e77f13f3e6a473af614ed9d4a
-  data.tar.gz: 41e731b6ab7cf71ca3f0e3645660354d426bdc45edc3da0d69cbaad6d93f6cf8a4e16a4f697061274d83b8fcfd89b4d88ef8fa3e5cf92ffee15f32d77f42f97e
+  metadata.gz: 823c8ce6237dd7a47600be8275a615243a887aa2e5d20bcfe5d527d189467fadb274783907645f49426132cce513f6e945c0b2bd38f386ffcd570851f75d7b70
+  data.tar.gz: ca1f844b515eb7de1d6201bf0341abe212b5a1502adf02d13c0051d44da5821302e920f8d8ce25f5c77ec047dc1c9f1b5c75bf7d6d51a370c1354ac47c0a48fd

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

@@ -1,4 +1,5 @@
 require 'active_support/deprecation'
+require_relative 'selector_assertions/count_describable'
 require_relative 'selector_assertions/html_selector'
 
 module Rails
@@ -59,16 +60,11 @@ module Rails
           raise ArgumentError, "you at least need a selector argument" if args.empty?
 
           root = args.size == 1 ? document_root_element : args.shift
-          selector = args.first
 
-          begin
-            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
-          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
         end
 
         # An assertion that selects elements and makes one or more equality tests.
@@ -168,37 +164,21 @@ module Rails
         def assert_select(*args, &block)
           @selected ||= nil
 
-          root = determine_root_from(args, @selected)
-          selector = HTMLSelector.new(root, args)
+          selector = HTMLSelector.new(args, @selected) { nodeset document_root_element }
 
-          matches = nil
-
-          begin
-            matches = selector.select
-
-            assert_size_match!(matches.size, selector.equality_tests, selector.source, selector.message)
-          rescue Nokogiri::CSS::SyntaxError => e
-            ActiveSupport::Deprecation.warn("The assertion was not run because of an invalid css selector.\n#{e}", caller(2))
+          if selecting_no_body?(selector)
+            assert true
             return
           end
 
-          nest_selection(matches, &block) if block_given? && !matches.empty?
+          selector.select.tap do |matches|
+            assert_size_match!(matches.size, selector.tests, selector.selector, selector.message)
 
-          matches
-        end
-
-        def count_description(min, max, count) #:nodoc:
-          pluralize = lambda {|word, quantity| word << (quantity == 1 ? '' : 's')}
-
-          if min && max && (max != min)
-            "between #{min} and #{max} elements"
-          elsif min && max && max == min && count
-            "exactly #{count} #{pluralize['element', min]}"
-          elsif min && !(min == 1 && max == 1)
-            "at least #{min} #{pluralize['element', min]}"
-          elsif max
-            "at most #{max} #{pluralize['element', max]}"
+            nest_selection(matches, &block) if block_given? && !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
         end
 
         # Extracts the content of an element, treats it as encoded HTML and runs
@@ -281,10 +261,12 @@ module Rails
           end
         end
 
-        protected
+        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."
+            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
@@ -300,29 +282,19 @@ module Rails
             end
           end
 
-          def determine_root_from(args, previous_selection = nil)
-            possible_root = args.first
-            if possible_root == nil
-              raise ArgumentError, "First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
-            elsif HTMLSelector.can_select_from?(possible_root)
-              args.shift # remove the root, so selector is the first argument
-              possible_root
-            elsif previous_selection
-              previous_selection
-            else
-              document_root_element
-            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.
-            begin
-              old_selected, @selected = @selected, selection
-              yield @selected
-            ensure
-              @selected = old_selected
-            end
+            old_selected, @selected = @selected, selection
+            yield @selected
+          ensure
+            @selected = old_selected
           end
 
           def nodeset(node)

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

@@ -0,0 +1,22 @@
+require 'active_support/concern'
+
+module CountDescripable
+  extend ActiveSupport::Concern
+
+  private
+    def count_description(min, max, count) #:nodoc:
+      if min && max && (max != min)
+        "between #{min} and #{max} elements"
+      elsif min && max && max == min && count
+        "exactly #{count} #{pluralize_element(min)}"
+      elsif min && !(min == 1 && max == 1)
+        "at least #{min} #{pluralize_element(min)}"
+      elsif max
+        "at most #{max} #{pluralize_element(max)}"
+      end
+    end
+
+    def pluralize_element(quantity)
+      quantity == 1 ? 'element' : 'elements'
+    end
+end

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

@@ -1,39 +1,37 @@
+require 'active_support/core_ext/module/attribute_accessors'
 require_relative 'substitution_context'
 
 class HTMLSelector #:nodoc:
-  NO_STRIP = %w{pre script style textarea}
-  attr_accessor :root, :selector, :equality_tests, :message
-
-  alias :source :selector
+  attr_reader :selector, :tests, :message
 
-  def initialize(root, args)
-    @root = root
-    @selector = extract_selector(args)
+  def initialize(values, previous_selection = nil, &root_fallback)
+    @values = values
+    @root = extract_root(previous_selection, root_fallback)
+    @selector = extract_selector
+    @tests = extract_equality_tests
+    @message = @values.shift
 
-    @equality_tests = equality_tests_from(args.shift)
-    @message = args.shift
-
-    if args.shift
+    if @values.shift
       raise ArgumentError, "Not expecting that last argument, you either have too many arguments, or they're the wrong type"
     end
   end
 
-  class << self
-    def can_select_from?(selector)
-      selector.respond_to?(:css)
-    end
-  end
-
   def select
-    filter root.css(selector, context)
+    filter @root.css(selector, context)
   end
 
+  private
+
+  NO_STRIP = %w{pre script style textarea}
+
+  mattr_reader(:context) { SubstitutionContext.new }
+
   def filter(matches)
-    match_with = equality_tests[:text] || equality_tests[:html]
+    match_with = tests[:text] || tests[:html]
     return matches if matches.empty? || !match_with
 
     content_mismatch = nil
-    text_matches = equality_tests.has_key?(:text)
+    text_matches = tests.has_key?(:text)
     regex_matching = match_with.is_a?(Regexp)
 
     remaining = matches.reject do |match|
@@ -48,24 +46,41 @@ class HTMLSelector #:nodoc:
       true
     end
 
-    self.message ||= content_mismatch if remaining.empty?
+    @message ||= content_mismatch if remaining.empty?
     Nokogiri::XML::NodeSet.new(matches.document, remaining)
   end
 
-  def extract_selector(values)
-    selector = values.shift
+  def extract_root(previous_selection, root_fallback)
+    possible_root = @values.first
+
+    if possible_root == nil
+      raise ArgumentError, 'First argument is either selector or element ' \
+        'to select, but nil found. Perhaps you called assert_select with ' \
+        'an element that does not exist?'
+    elsif possible_root.respond_to?(:css)
+      @values.shift # remove the root, so selector is the first argument
+      possible_root
+    elsif previous_selection
+      previous_selection
+    else
+      root_fallback.call
+    end
+  end
+
+  def extract_selector
+    selector = @values.shift
 
     unless selector.is_a? String
       raise ArgumentError, "Expecting a selector as the first argument"
     end
 
-    context.substitute!(selector, values)
+    context.substitute!(selector, @values)
     selector
   end
 
-  def equality_tests_from(comparator)
+  def extract_equality_tests
     comparisons = {}
-    case comparator
+    case comparator = @values.shift
       when Hash
         comparisons = comparator
       when String, Regexp
@@ -90,8 +105,4 @@ class HTMLSelector #:nodoc:
     end
     comparisons
   end
-
-  def context
-    @context ||= SubstitutionContext.new
-  end
-end
+end

data/lib/rails/dom/testing/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Dom
     module Testing
-      VERSION = "1.0.4"
+      VERSION = "1.0.5"
     end
   end
 end

data/test/selector_assertions_test.rb

@@ -280,10 +280,20 @@ EOF
   end
 
   def test_body_not_present_in_empty_document
-    render_html ''
+    render_html '<div></div>'
     assert_select 'body', 0
   end
 
+  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
     def render_html(html)
       fake_render(:html, html)
@@ -295,13 +305,13 @@ EOF
 
     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
+      @html_document.root
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-dom-testing
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Rafael Mendonça França
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -115,6 +115,7 @@ files:
 - lib/rails/dom/testing/assertions.rb
 - lib/rails/dom/testing/assertions/dom_assertions.rb
 - lib/rails/dom/testing/assertions/selector_assertions.rb
+- lib/rails/dom/testing/assertions/selector_assertions/count_describable.rb
 - lib/rails/dom/testing/assertions/selector_assertions/html_selector.rb
 - lib/rails/dom/testing/assertions/selector_assertions/substitution_context.rb
 - lib/rails/dom/testing/assertions/tag_assertions.rb
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem can compare doms and assert certain elements exists in doms using
@@ -153,4 +154,3 @@ test_files:
 - test/selector_assertions_test.rb
 - test/tag_assertions_test.rb
 - test/test_helper.rb
-has_rdoc: