rails-dom-testing 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25916970c49a8bacd1a2153cedaf2474cdceb73a
-  data.tar.gz: a3ce7d48ccb543f0abf1bd2354493a3281a38a04
+  metadata.gz: 44d4f14bd073cd6863e98c91e68cdd0841b79f03
+  data.tar.gz: 52bfa7441b482a26893322386ec0774542153804
 SHA512:
-  metadata.gz: 0c3389884b69ad22df708e36656e72cafa18b71868d6aadab3e47d0f8228ec885c84f06bde22424a6e84c9a2612ccb210b951e3fbbb3f4fa863dd26def4d5f0d
-  data.tar.gz: 3340db215cba92832210bc2847ebb043c855461fc76fcaaa39e70463599a6b5fd2fa3030795a805ada92e9a2cf72e37cfab2d724bb865feae056ac835878540d
+  metadata.gz: 75a264e23323a077ae8a5d73e3f356689b7eb48d7a35e75cecce81c74423ba8b638d75dca49c593252acd18de4de6e3f1b6cd0b3e8db9e669a421b0e76339a1c
+  data.tar.gz: 36b2b12547bca87796e856f01684af0895a97239f649fa7e40cf66c4f49732b23965d425ce38b87f3acd8ff7703a94c528488e888342b856063141bd5d5a3df6

data/README.md

@@ -4,6 +4,7 @@
 This gem is responsible for comparing HTML doms and asserting that DOM elements are present in Rails applications.
 Doms are compared via `assert_dom_equal` and `assert_dom_not_equal`.
 Elements are asserted via `assert_select`, `assert_select_encoded`, `assert_select_email` and a subset of the dom can be selected with `css_select`.
+The gem is developed for Rails 4.2 and above, and will not work on previous versions.
 
 
 ## Installation

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

@@ -40,7 +40,8 @@ module Rails
 
               if child.element?
                 child.name == other_child.name &&
-                    equal_attribute_nodes?(child.attribute_nodes, other_child.attribute_nodes)
+                    equal_attribute_nodes?(child.attribute_nodes, other_child.attribute_nodes) &&
+                    compare_doms(child, other_child)
               else
                 child.to_s == other_child.to_s
               end

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

@@ -61,8 +61,11 @@ module Rails
           root = args.size == 1 ? document_root_element : args.shift
           selector = args.first
 
-          catch_invalid_selector do
+          begin
             nodeset(root).css(selector)
+          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
         end
 
@@ -167,10 +170,14 @@ module Rails
           selector = HTMLSelector.new(root, args)
 
           matches = nil
-          catch_invalid_selector do
+
+          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))
+            return
           end
 
           nest_selection(matches, &block) if block_given? && !matches.empty?
@@ -278,15 +285,6 @@ module Rails
             raise NotImplementedError, "Implementing document_root_element makes assert_select work without needing to specify an element to select from."
           end
 
-          def catch_invalid_selector
-            begin
-              yield
-            rescue Nokogiri::CSS::SyntaxError => e
-              ActiveSupport::Deprecation.warn("The assertion was not run because of an invalid css selector.\n#{e}")
-              return
-            end
-          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]
@@ -310,7 +308,7 @@ module Rails
             elsif previous_selection
               previous_selection
             else
-              document_root_element
+              nodeset document_root_element
             end
           end
 

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

@@ -60,6 +60,7 @@ class HTMLSelector #:nodoc:
     end
 
     context.substitute!(selector, values)
+    selector
   end
 
   def equality_tests_from(comparator)

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

@@ -1,28 +1,30 @@
 class SubstitutionContext
-  def initialize(substitute = '?')
-    @substitute = substitute
+  def initialize
+    @substitute = '?'
     @regexes = []
   end
 
-  def add_regex(regex)
-    # Nokogiri doesn't like arbitrary values without quotes, hence inspect.
-    return regex.inspect unless regex.is_a?(Regexp)
-    @regexes.push(regex)
-    last_id.to_s # avoid implicit conversions of Fixnum to String
+  def substitute!(selector, values)
+    while !values.empty? && substitutable?(values.first) && selector.index(@substitute)
+      selector.sub! @substitute, substitution_id_for(values.shift)
+    end
   end
 
-  def last_id
-    @regexes.count - 1
+  def match(matches, attribute, substitution_id)
+    matches.find_all { |node| node[attribute] =~ @regexes[substitution_id] }
   end
 
-  def match(matches, attribute, id)
-    matches.find_all { |node| node[attribute] =~ @regexes[id] }
-  end
+  private
+    def substitution_id_for(value)
+      if value.is_a?(Regexp)
+        @regexes << value
+        @regexes.size - 1
+      else
+        value
+      end.inspect # Nokogiri doesn't like arbitrary values without quotes, hence inspect.
+    end
 
-  def substitute!(selector, values)
-    while !values.empty? && selector.index(@substitute)
-      selector.sub!(@substitute, add_regex(values.shift))
+    def substitutable?(value)
+      value.is_a?(String) || value.is_a?(Regexp)
     end
-    selector
-  end
 end

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

@@ -1,7 +1,7 @@
 module Rails
   module Dom
     module Testing
-      VERSION = "1.0.2"
+      VERSION = "1.0.3"
     end
   end
 end

data/test/dom_assertions_test.rb

@@ -40,4 +40,11 @@ class DomAssertionsTest < ActiveSupport::TestCase
 
     assert_equal e.message, message
   end
+
+  def test_unequal_dom_attributes_in_children
+    assert_dom_not_equal(
+      %{<a><b c="1" /></a>},
+      %{<a><b c="2" /></a>}
+    )
+  end
 end

data/test/selector_assertions_test.rb

@@ -40,6 +40,14 @@ class AssertSelectTest < ActiveSupport::TestCase
     assert_nothing_raised    { assert_select "p", false }
   end
 
+  def test_equality_false_with_substitution
+    render_html %{<a></a>}
+
+    assert_nothing_raised do
+      assert_select %{a[href="http://example.org?query=value"]}, false
+    end
+  end
+
   def test_equality_false_message
     render_html %Q{<div id="1"></div><div id="2"></div>}
     assert_failure(/Expected exactly 0 elements matching \"div\", found 2/) { assert_select "div", false }
@@ -127,6 +135,18 @@ class AssertSelectTest < ActiveSupport::TestCase
     end
   end
 
+  def test_assert_select_root_html
+    render_html '<a></a>'
+
+    assert_select 'a'
+  end
+
+  def test_assert_select_root_xml
+    render_xml '<rss version="2.0"></rss>'
+
+    assert_select 'rss'
+  end
+
   def test_nested_assert_select
     render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
     assert_select "div" do |elements|
@@ -233,6 +253,7 @@ class AssertSelectTest < ActiveSupport::TestCase
   </channel>
 </rss>
 EOF
+
     assert_select "channel item description" do
 
       assert_select_encoded do

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'nokogiri'
+require 'active_support'
 require 'active_support/test_case'
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-dom-testing
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Rafael Mendonça França
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -103,7 +103,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/rails-dom-testing.rb
@@ -138,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem can compare doms and assert certain elements exists in doms using
@@ -148,4 +147,3 @@ test_files:
 - test/selector_assertions_test.rb
 - test/tag_assertions_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/CHANGELOG.md

@@ -1,7 +0,0 @@
-# 1.0.2
-
-* Add deprecated `assert_tag`.
-
-# 1.0.0
-
-* First Release.