rspec-html-matchers 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c280c0fd064492e078852526a508bd84e6caca
-  data.tar.gz: 83887d4b20b714cfb7456b079960e3df4f3c5d53
+  metadata.gz: 8cc4b6854824aeacab03d525dc5a1b63cb1beb3d
+  data.tar.gz: c5d1a519855e7188533cf3967147d835fd4fd818
 SHA512:
-  metadata.gz: 8abf7a4a88eb220f105603e528e4b75c7807caa1e3174a20e0c689276b484153c9724d810a5042beb71a9812681e97a04641a457f27d0078c2ac0c9dc309ade6
-  data.tar.gz: 784db376e190ad1f85d1bd181e3db36fe9dcdace86d516b906ce79f637abddc6800ab762225b83216506fe69d32f061fe787b70b029f4b50cb4f250054acfb5b
+  metadata.gz: 8216b50ce200d8cddb1071016529de18c311c2ad8ae34a99b3e7bda47d8560518fe58a10d78baaed350d4fc01a17a4dad05facb8bb914e16f46f56549b8d2c2c
+  data.tar.gz: d792ede080051791c628792831e345f3a00adfe1eeaf0fd94554e7c9b123454460672a00d63159a84289cdc77571d60d7f2901585d8be53f60a9e7bab35be680

data/CHANGELOG.md

@@ -6,15 +6,21 @@ unreleased(TODO)
 
 * with_tag should raise error when used outside have_tag
 * add ability to have_form('/url', 'PUT') or have_form('/url', :PUT)
-* inteligent check comments(make sure it is not searching inside comments)
+* intelligent check comments(make sure it is not searching inside comments)
 * shouldn't show all markup in error message if it is too big
 * order matching
 * improve documentation, add more usage examples (look at changelog and code!)
 
+0.9.1
+-----
+
+* re-added ruby support back to 1.8.7 (supporting same versions as rspec 3)
+* split lib in few files
+
 0.9.0
 -----
 
-* fixed `with\_tag` nesting (thanks to [randoum](https://github.com/randoum): [#59](https://github.com/kucaahbe/rspec-html-matchers/pull/59))
+* fixed `with_tag` nesting (thanks to [randoum](https://github.com/randoum): [#59](https://github.com/kucaahbe/rspec-html-matchers/pull/59))
 * added ~> 2.4 ruby support
 * removed ~> 2 ruby support
 

data/README.md

@@ -9,7 +9,7 @@ rspec-html-matchers
 Goals
 -----
 
-* for testing **complicated** html output, for simple matching consider use:
+* designed for testing **complex** html output. If you plan to perform simple matching, consider using:
   * [assert_select](http://api.rubyonrails.org/classes/ActionDispatch/Assertions/SelectorAssertions.html#method-i-assert_select)
   * [matchers provided out of the box in rspec-rails](https://www.relishapp.com/rspec/rspec-rails/v/2-11/docs/view-specs/view-spec)
   * [matchers provided by capybara](http://rdoc.info/github/jnicklas/capybara/Capybara/Node/Matchers)

data/lib/rspec-html-matchers.rb

@@ -1,267 +1,14 @@
 # frozen_string_literal: true
 # encoding: UTF-8
+
 require 'rspec'
 require 'nokogiri'
 
-module RSpecHtmlMatchers
-
-  # @api
-  # @private
-  # for nokogiri regexp matching
-  class NokogiriRegexpHelper
-    def initialize(regex)
-      @regex = regex
-    end
-
-    def regexp node_set
-      node_set.find_all { |node| node.content =~ @regex }
-    end
-  end
-
-  # @api
-  # @private
-  class NokogiriTextHelper
-    NON_BREAKING_SPACE = "\u00a0"
-
-    def initialize text, squeeze_text = false
-      @text = text
-      @squeeze_text = squeeze_text
-    end
-
-    def content node_set
-      node_set.find_all do |node|
-        actual_content = node.content.gsub(NON_BREAKING_SPACE, ' ')
-        actual_content = node.content.strip.squeeze(' ') if @squeeze_text
-
-        actual_content == @text
-      end
-    end
-  end
-
-  # @api
-  # @private
-  class HaveTag
-    attr_reader :failure_message, :failure_message_when_negated
-    attr_reader :parent_scope, :current_scope
-
-    DESCRIPTIONS = {
-      :have_at_least_1 => %Q|have at least 1 element matching "%s"|,
-      :have_n          => %Q|have %i element(s) matching "%s"|
-    }
-
-    MESSAGES = {
-      :expected_tag         => %Q|expected following:\n%s\nto #{DESCRIPTIONS[:have_at_least_1]}, found 0.|,
-      :unexpected_tag       => %Q|expected following:\n%s\nto NOT have element matching "%s", found %s.|,
-
-      :expected_count       => %Q|expected following:\n%s\nto #{DESCRIPTIONS[:have_n]}, found %s.|,
-      :unexpected_count     => %Q|expected following:\n%s\nto NOT have %i element(s) matching "%s", but found.|,
-
-      :expected_btw_count   => %Q|expected following:\n%s\nto have at least %i and at most %i element(s) matching "%s", found %i.|,
-      :unexpected_btw_count => %Q|expected following:\n%s\nto NOT have at least %i and at most %i element(s) matching "%s", but found %i.|,
-
-      :expected_at_most     => %Q|expected following:\n%s\nto have at most %i element(s) matching "%s", found %i.|,
-      :unexpected_at_most   => %Q|expected following:\n%s\nto NOT have at most %i element(s) matching "%s", but found %i.|,
-
-      :expected_at_least    => %Q|expected following:\n%s\nto have at least %i element(s) matching "%s", found %i.|,
-      :unexpected_at_least  => %Q|expected following:\n%s\nto NOT have at least %i element(s) matching "%s", but found %i.|,
-
-      :expected_regexp      => %Q|%s regexp expected within "%s" in following template:\n%s|,
-      :unexpected_regexp    => %Q|%s regexp unexpected within "%s" in following template:\n%s\nbut was found.|,
-
-      :expected_text        => %Q|"%s" expected within "%s" in following template:\n%s|,
-      :unexpected_text      => %Q|"%s" unexpected within "%s" in following template:\n%s\nbut was found.|,
-
-      :wrong_count_error    => %Q|:count with :minimum or :maximum has no sence!|,
-      :min_max_error        => %Q|:minimum should be less than :maximum!|,
-      :bad_range_error      => %Q|Your :count range(%s) has no sence!|,
-    }
-
-
-    def initialize tag, options={}, &block
-      @tag, @options, @block = tag.to_s, options, block
-
-      if with_attrs = @options.delete(:with)
-        if classes = with_attrs.delete(:class)
-          @tag += '.' + classes_to_selector(classes)
-        end
-        selector = with_attrs.inject('') do |html_attrs_string, (k, v)|
-          html_attrs_string += "[#{k}='#{v}']"
-        html_attrs_string
-        end
-        @tag += selector
-      end
-
-      if without_attrs = @options.delete(:without)
-        if classes = without_attrs.delete(:class)
-          @tag += ":not(.#{classes_to_selector(classes)})"
-        end
-      end
-
-      validate_options!
-      set_options
-    end
-
-    def matches? document, &block
-      @block = block if block
-
-      document = document.html if defined?(Capybara::Session) && document.is_a?(Capybara::Session)
-
-      case document
-      when String
-        @parent_scope = Nokogiri::HTML(document)
-        @document     = document
-      else
-        @parent_scope  = document.current_scope
-        @document      = @parent_scope.to_html
-      end
-      @current_scope = begin
-                         @parent_scope.css(@tag)
-                       # on jruby this produce exception if css was not found:
-                       # undefined method `decorate' for nil:NilClass
-                       rescue NoMethodError
-                         Nokogiri::XML::NodeSet.new(Nokogiri::XML::Document.new)
-                       end
-      if tag_presents? and text_right? and count_right?
-        @block.call(self) if @block
-        true
-      else
-        false
-      end
-    end
+require 'rspec-html-matchers/nokogiri_regexp_helper'
+require 'rspec-html-matchers/nokogiri_text_helper'
+require 'rspec-html-matchers/have_tag'
 
-    def document
-      @document
-    end
-
-    def description
-      # TODO should it be more complicated?
-      if @options.has_key?(:count)
-        DESCRIPTIONS[:have_n] % [@options[:count],@tag]
-      else
-        DESCRIPTIONS[:have_at_least_1] % @tag
-      end
-    end
-
-    private
-
-    def classes_to_selector(classes)
-      case classes
-      when Array
-        classes.join('.')
-      when String
-        classes.gsub(/\s+/, '.')
-      end
-    end
-
-    def tag_presents?
-      if @current_scope.first
-        @count = @current_scope.count
-        @failure_message_when_negated = MESSAGES[:unexpected_tag] % [@document, @tag, @count]
-        true
-      else
-        @failure_message          = MESSAGES[:expected_tag] % [@document, @tag]
-        false
-      end
-    end
-
-    def count_right?
-      case @options[:count]
-      when Integer
-        ((@failure_message_when_negated=MESSAGES[:unexpected_count] % [@document,@count,@tag]) && @count == @options[:count]) || (@failure_message=MESSAGES[:expected_count] % [@document,@options[:count],@tag,@count]; false)
-      when Range
-        ((@failure_message_when_negated=MESSAGES[:unexpected_btw_count] % [@document,@options[:count].min,@options[:count].max,@tag,@count]) && @options[:count].member?(@count)) || (@failure_message=MESSAGES[:expected_btw_count] % [@document,@options[:count].min,@options[:count].max,@tag,@count]; false)
-      when nil
-        if @options[:maximum]
-          ((@failure_message_when_negated=MESSAGES[:unexpected_at_most] % [@document,@options[:maximum],@tag,@count]) && @count <= @options[:maximum]) || (@failure_message=MESSAGES[:expected_at_most] % [@document,@options[:maximum],@tag,@count]; false)
-        elsif @options[:minimum]
-          ((@failure_message_when_negated=MESSAGES[:unexpected_at_least] % [@document,@options[:minimum],@tag,@count]) && @count >= @options[:minimum]) || (@failure_message=MESSAGES[:expected_at_least] % [@document,@options[:minimum],@tag,@count]; false)
-        else
-          true
-        end
-      end
-    end
-
-    def text_right?
-      return true unless @options[:text]
-
-      case text=@options[:text]
-      when Regexp
-        new_scope = @current_scope.css(':regexp()',NokogiriRegexpHelper.new(text))
-        unless new_scope.empty?
-          @count = new_scope.count
-          @failure_message_when_negated = MESSAGES[:unexpected_regexp] % [text.inspect,@tag,@document]
-          true
-        else
-          @failure_message          = MESSAGES[:expected_regexp] % [text.inspect,@tag,@document]
-          false
-        end
-      else
-        new_scope = @current_scope.css(':content()', NokogiriTextHelper.new(text, @options[:squeeze_text]))
-        unless new_scope.empty?
-          @count = new_scope.count
-          @failure_message_when_negated = MESSAGES[:unexpected_text] % [text,@tag,@document]
-          true
-        else
-          @failure_message          = MESSAGES[:expected_text] % [text,@tag,@document]
-          false
-        end
-      end
-    end
-
-    protected
-
-    def validate_options!
-      validate_count_presence!
-      validate_count_when_set_min_max!
-      validate_count_when_set_range!
-    end
-
-    def validate_count_presence!
-      raise 'wrong :count specified' unless [Range, NilClass].include?(@options[:count].class) or @options[:count].is_a?(Integer)
-
-      [:min, :minimum, :max, :maximum].each do |key|
-        raise MESSAGES[:wrong_count_error] if @options.has_key?(key) and @options.has_key?(:count)
-      end
-    end
-
-    def validate_count_when_set_min_max!
-      begin
-        raise MESSAGES[:min_max_error] if @options[:minimum] > @options[:maximum]
-      rescue NoMethodError # nil > 4
-      rescue ArgumentError # 2 < nil
-      end
-    end
-
-    def validate_count_when_set_range!
-      begin
-        begin
-          raise MESSAGES[:bad_range_error] % [@options[:count].to_s] if count_is_range_but_no_min?
-        rescue ArgumentError, "comparison of String with" # if @options[:count] == 'a'..'z'
-          raise MESSAGES[:bad_range_error] % [@options[:count].to_s]
-        end
-      rescue TypeError # fix for 1.8.7 for 'rescue ArgumentError, "comparison of String with"' stroke
-        raise MESSAGES[:bad_range_error] % [@options[:count].to_s]
-      end
-    end
-
-    def count_is_range_but_no_min?
-      @options[:count] && @options[:count].is_a?(Range) &&
-        (@options[:count].min.nil? or @options[:count].min < 0)
-    end
-
-    def set_options
-      @options[:minimum] ||= @options.delete(:min)
-      @options[:maximum] ||= @options.delete(:max)
-
-      @options[:text] = @options[:text].to_s if @options.has_key?(:text) && !@options[:text].is_a?(Regexp)
-
-      if @options.has_key?(:seen) && !@options[:seen].is_a?(Regexp)
-        @options[:text] = @options[:seen].to_s
-        @options[:squeeze_text] = true
-      end
-    end
-
-  end
+module RSpecHtmlMatchers
 
   # tag assertion, this is the core of functionality, other matchers are shortcuts to this matcher
   #
@@ -304,7 +51,7 @@ module RSpecHtmlMatchers
   end
 
   def have_empty_tag tag, options={}
-    have_tag(tag, options.merge(text: ""))
+    have_tag(tag, options.merge(:text => ""))
   end
 
   def with_text text

data/lib/rspec-html-matchers/have_tag.rb

@@ -0,0 +1,231 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+
+module RSpecHtmlMatchers
+
+  # @api
+  # @private
+  class HaveTag
+    attr_reader :failure_message, :failure_message_when_negated
+    attr_reader :parent_scope, :current_scope
+
+    DESCRIPTIONS = {
+        :have_at_least_1 => %Q|have at least 1 element matching "%s"|,
+        :have_n          => %Q|have %i element(s) matching "%s"|
+    }
+
+    MESSAGES = {
+        :expected_tag         => %Q|expected following:\n%s\nto #{DESCRIPTIONS[:have_at_least_1]}, found 0.|,
+        :unexpected_tag       => %Q|expected following:\n%s\nto NOT have element matching "%s", found %s.|,
+
+        :expected_count       => %Q|expected following:\n%s\nto #{DESCRIPTIONS[:have_n]}, found %s.|,
+        :unexpected_count     => %Q|expected following:\n%s\nto NOT have %i element(s) matching "%s", but found.|,
+
+        :expected_btw_count   => %Q|expected following:\n%s\nto have at least %i and at most %i element(s) matching "%s", found %i.|,
+        :unexpected_btw_count => %Q|expected following:\n%s\nto NOT have at least %i and at most %i element(s) matching "%s", but found %i.|,
+
+        :expected_at_most     => %Q|expected following:\n%s\nto have at most %i element(s) matching "%s", found %i.|,
+        :unexpected_at_most   => %Q|expected following:\n%s\nto NOT have at most %i element(s) matching "%s", but found %i.|,
+
+        :expected_at_least    => %Q|expected following:\n%s\nto have at least %i element(s) matching "%s", found %i.|,
+        :unexpected_at_least  => %Q|expected following:\n%s\nto NOT have at least %i element(s) matching "%s", but found %i.|,
+
+        :expected_regexp      => %Q|%s regexp expected within "%s" in following template:\n%s|,
+        :unexpected_regexp    => %Q|%s regexp unexpected within "%s" in following template:\n%s\nbut was found.|,
+
+        :expected_text        => %Q|"%s" expected within "%s" in following template:\n%s|,
+        :unexpected_text      => %Q|"%s" unexpected within "%s" in following template:\n%s\nbut was found.|,
+
+        :wrong_count_error    => %Q|:count with :minimum or :maximum has no sence!|,
+        :min_max_error        => %Q|:minimum should be less than :maximum!|,
+        :bad_range_error      => %Q|Your :count range(%s) has no sence!|,
+    }
+
+
+    def initialize tag, options={}, &block
+      @tag, @options, @block = tag.to_s, options, block
+
+      if with_attrs = @options.delete(:with)
+        if classes = with_attrs.delete(:class)
+          @tag += '.' + classes_to_selector(classes)
+        end
+        selector = with_attrs.inject('') do |html_attrs_string, (k, v)|
+          html_attrs_string += "[#{k}='#{v}']"
+          html_attrs_string
+        end
+        @tag += selector
+      end
+
+      if without_attrs = @options.delete(:without)
+        if classes = without_attrs.delete(:class)
+          @tag += ":not(.#{classes_to_selector(classes)})"
+        end
+      end
+
+      validate_options!
+      set_options
+    end
+
+    def matches? document, &block
+      @block = block if block
+
+      document = document.html if defined?(Capybara::Session) && document.is_a?(Capybara::Session)
+
+      case document
+        when String
+          @parent_scope = Nokogiri::HTML(document)
+          @document     = document
+        else
+          @parent_scope  = document.current_scope
+          @document      = @parent_scope.to_html
+      end
+      @current_scope = begin
+        @parent_scope.css(@tag)
+          # on jruby this produce exception if css was not found:
+          # undefined method `decorate' for nil:NilClass
+      rescue NoMethodError
+        Nokogiri::XML::NodeSet.new(Nokogiri::XML::Document.new)
+      end
+      if tag_presents? and text_right? and count_right?
+        @block.call(self) if @block
+        true
+      else
+        false
+      end
+    end
+
+    def document
+      @document
+    end
+
+    def description
+      # TODO should it be more complicated?
+      if @options.has_key?(:count)
+        DESCRIPTIONS[:have_n] % [@options[:count],@tag]
+      else
+        DESCRIPTIONS[:have_at_least_1] % @tag
+      end
+    end
+
+    private
+
+    def classes_to_selector(classes)
+      case classes
+        when Array
+          classes.join('.')
+        when String
+          classes.gsub(/\s+/, '.')
+      end
+    end
+
+    def tag_presents?
+      if @current_scope.first
+        @count = @current_scope.count
+        @failure_message_when_negated = MESSAGES[:unexpected_tag] % [@document, @tag, @count]
+        true
+      else
+        @failure_message          = MESSAGES[:expected_tag] % [@document, @tag]
+        false
+      end
+    end
+
+    def count_right?
+      case @options[:count]
+        when Integer
+          ((@failure_message_when_negated=MESSAGES[:unexpected_count] % [@document,@count,@tag]) && @count == @options[:count]) || (@failure_message=MESSAGES[:expected_count] % [@document,@options[:count],@tag,@count]; false)
+        when Range
+          ((@failure_message_when_negated=MESSAGES[:unexpected_btw_count] % [@document,@options[:count].min,@options[:count].max,@tag,@count]) && @options[:count].member?(@count)) || (@failure_message=MESSAGES[:expected_btw_count] % [@document,@options[:count].min,@options[:count].max,@tag,@count]; false)
+        when nil
+          if @options[:maximum]
+            ((@failure_message_when_negated=MESSAGES[:unexpected_at_most] % [@document,@options[:maximum],@tag,@count]) && @count <= @options[:maximum]) || (@failure_message=MESSAGES[:expected_at_most] % [@document,@options[:maximum],@tag,@count]; false)
+          elsif @options[:minimum]
+            ((@failure_message_when_negated=MESSAGES[:unexpected_at_least] % [@document,@options[:minimum],@tag,@count]) && @count >= @options[:minimum]) || (@failure_message=MESSAGES[:expected_at_least] % [@document,@options[:minimum],@tag,@count]; false)
+          else
+            true
+          end
+      end
+    end
+
+    def text_right?
+      return true unless @options[:text]
+
+      case text=@options[:text]
+        when Regexp
+          new_scope = @current_scope.css(':regexp()',NokogiriRegexpHelper.new(text))
+          unless new_scope.empty?
+            @count = new_scope.count
+            @failure_message_when_negated = MESSAGES[:unexpected_regexp] % [text.inspect,@tag,@document]
+            true
+          else
+            @failure_message          = MESSAGES[:expected_regexp] % [text.inspect,@tag,@document]
+            false
+          end
+        else
+          new_scope = @current_scope.css(':content()', NokogiriTextHelper.new(text, @options[:squeeze_text]))
+          unless new_scope.empty?
+            @count = new_scope.count
+            @failure_message_when_negated = MESSAGES[:unexpected_text] % [text,@tag,@document]
+            true
+          else
+            @failure_message          = MESSAGES[:expected_text] % [text,@tag,@document]
+            false
+          end
+      end
+    end
+
+    protected
+
+    def validate_options!
+      validate_count_presence!
+      validate_count_when_set_min_max!
+      validate_count_when_set_range!
+    end
+
+    def validate_count_presence!
+      raise 'wrong :count specified' unless [Range, NilClass].include?(@options[:count].class) or @options[:count].is_a?(Integer)
+
+      [:min, :minimum, :max, :maximum].each do |key|
+        raise MESSAGES[:wrong_count_error] if @options.has_key?(key) and @options.has_key?(:count)
+      end
+    end
+
+    def validate_count_when_set_min_max!
+      begin
+        raise MESSAGES[:min_max_error] if @options[:minimum] > @options[:maximum]
+      rescue NoMethodError # nil > 4
+      rescue ArgumentError # 2 < nil
+      end
+    end
+
+    def validate_count_when_set_range!
+      begin
+        begin
+          raise MESSAGES[:bad_range_error] % [@options[:count].to_s] if count_is_range_but_no_min?
+        rescue ArgumentError, "comparison of String with" # if @options[:count] == 'a'..'z'
+          raise MESSAGES[:bad_range_error] % [@options[:count].to_s]
+        end
+      rescue TypeError # fix for 1.8.7 for 'rescue ArgumentError, "comparison of String with"' stroke
+        raise MESSAGES[:bad_range_error] % [@options[:count].to_s]
+      end
+    end
+
+    def count_is_range_but_no_min?
+      @options[:count] && @options[:count].is_a?(Range) &&
+          (@options[:count].min.nil? or @options[:count].min < 0)
+    end
+
+    def set_options
+      @options[:minimum] ||= @options.delete(:min)
+      @options[:maximum] ||= @options.delete(:max)
+
+      @options[:text] = @options[:text].to_s if @options.has_key?(:text) && !@options[:text].is_a?(Regexp)
+
+      if @options.has_key?(:seen) && !@options[:seen].is_a?(Regexp)
+        @options[:text] = @options[:seen].to_s
+        @options[:squeeze_text] = true
+      end
+    end
+
+  end
+
+end

data/lib/rspec-html-matchers/nokogiri_regexp_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+
+module RSpecHtmlMatchers
+
+  # @api
+  # @private
+  # for nokogiri regexp matching
+  class NokogiriRegexpHelper
+    def initialize(regex)
+      @regex = regex
+    end
+
+    def regexp node_set
+      node_set.find_all { |node| node.content =~ @regex }
+    end
+  end
+
+end

data/lib/rspec-html-matchers/nokogiri_text_helper.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+
+module RSpecHtmlMatchers
+
+  # @api
+  # @private
+  class NokogiriTextHelper
+    NON_BREAKING_SPACE = "\u00a0"
+
+    def initialize text, squeeze_text = false
+      @text = text
+      @squeeze_text = squeeze_text
+    end
+
+    def content node_set
+      node_set.find_all do |node|
+        actual_content = node.content.gsub(NON_BREAKING_SPACE, ' ')
+        actual_content = node.content.strip.squeeze(' ') if @squeeze_text
+
+        actual_content == @text
+      end
+    end
+  end
+
+end

data/lib/rspec-html-matchers/version.rb

@@ -0,0 +1,5 @@
+module RSpecHtmlMatchers
+  module Version
+    VERSION = '0.9.1'
+  end
+end

data/spec/form_matchers_spec.rb

@@ -7,7 +7,7 @@ describe "have_form" do
     it "should find form" do
       # sanity check
       expect(rendered).to have_form("/books", :post)
-      expect(rendered).to have_form("/books", "post", with: { id: "new_book", class: %w(book formtastic) })
+      expect(rendered).to have_form("/books", "post", :with => { :id => "new_book", :class => %w(book formtastic) })
     end
 
     it "should not find form" do
@@ -20,15 +20,15 @@ describe "have_form" do
     context "with_select" do
       it "should find select" do
         expect(rendered).to have_form("/books", :post) do
-          with_select("book[publisher_id]", with: { id: "book_publisher_id" })
-          with_select("book[publisher_id]", with: { id: "book_publisher_id" })
+          with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
+          with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
         end
       end
 
       it "should not find select" do
         expect(rendered).to have_form("/books", :post) do
-          without_select("book[publisher_id]", with: { id: "other_id" })
-          without_select("koob[publisher_id]", with: { id: "book_publisher_id" })
+          without_select("book[publisher_id]", :with => { :id => "other_id" })
+          without_select("koob[publisher_id]", :with => { :id => "book_publisher_id" })
         end
       end
 
@@ -37,9 +37,9 @@ describe "have_form" do
           expect(rendered).to have_form("/books", :post) do
             with_select("book[publisher_id]") do
               with_option(nil)
-              with_option("The Pragmatic Bookshelf", selected: true)
+              with_option("The Pragmatic Bookshelf", :selected => true)
               with_option(/sitepoint/,2)
-              with_option("O'Reilly", 3, selected: false)
+              with_option("O'Reilly", 3, :selected => false)
             end
           end
         end
@@ -48,7 +48,7 @@ describe "have_form" do
           expect(rendered).to have_form("/books", :post) do
             with_select("book[publisher_id]") do
               without_option("blah blah")
-              without_option("O'Reilly", 3, selected: true)
+              without_option("O'Reilly", 3, :selected => true)
               without_option("O'Reilly", 100500)
             end
           end
@@ -163,8 +163,8 @@ describe "have_form" do
         expect(rendered).to have_form("/books", :post) do
           with_range_field('range1', 1, 3)
           with_range_field('range1','1','3')
-          with_range_field('range2', 1, 3, with: { value: 2 } )
-          with_range_field('range2', 1, 3, with: { value: '2' } )
+          with_range_field('range2', 1, 3, :with => { :value => 2 } )
+          with_range_field('range2', 1, 3, :with => { :value => '2' } )
         end
       end
 
@@ -172,7 +172,7 @@ describe "have_form" do
         expect(rendered).to have_form("/books", :post) do
           without_range_field('number')
           without_range_field('range1', 1, 5)
-          without_range_field('range2', 1, 3, with: { value: 5 } )
+          without_range_field('range2', 1, 3, :with => { :value => 5 } )
         end
       end
     end
@@ -182,7 +182,7 @@ describe "have_form" do
         expect(rendered).to have_form("/books", :post) do
           with_date_field(:date)
           with_date_field(:date, 'book_date')
-          with_date_field(:month, 'book_month', with: { value: 5 })
+          with_date_field(:month, 'book_month', :with => { :value => 5 })
           with_date_field(:week,'book_week')
           with_date_field(:time, 'book_time')
           with_date_field(:datetime, 'book_datetime')
@@ -193,7 +193,7 @@ describe "have_form" do
       it "should not find date field" do
         expect(rendered).to have_form("/books", :post) do
           without_date_field(:date, 'book_something')
-          without_date_field(:month, 'book_month', with: { value: 100500 })
+          without_date_field(:month, 'book_month', :with => { :value => 100500 })
         end
       end
 

data/spec/have_empty_tag_spec.rb

@@ -6,9 +6,9 @@ describe 'have_empty_tag' do
     asset 'single_element'
 
     it { expect(rendered).to have_empty_tag('div') }
-    it { expect(rendered).to have_empty_tag('div', class: "foo") }
-    it { expect(rendered).to have_empty_tag('div', class: "bar") }
-    it { expect(rendered).to have_empty_tag('div', class: "foo bar") }
+    it { expect(rendered).to have_empty_tag('div', :class => "foo") }
+    it { expect(rendered).to have_empty_tag('div', :class => "bar") }
+    it { expect(rendered).to have_empty_tag('div', :class => "foo bar") }
   end
 
   context 'when paragraphs' do
@@ -23,7 +23,7 @@ describe 'have_empty_tag' do
     it { expect(rendered).to_not have_empty_tag('html') }
     it { expect(rendered).to_not have_empty_tag('body') }
     it { expect(rendered).to_not have_empty_tag('ol') }
-    it { expect(rendered).to_not have_empty_tag('ol', class: 'menu') }
+    it { expect(rendered).to_not have_empty_tag('ol', :class => 'menu') }
     it { expect(rendered).to_not have_empty_tag('li') }
   end
 end

data/spec/have_tag_spec.rb

@@ -295,7 +295,9 @@ describe 'have_tag' do
         expect(rendered).to have_tag('p',    :seen => 'content with ignored spaces in')
         expect(rendered).to have_tag('p',    :seen => 'content with nbsp  and  spaces   around')
 
-        expect(rendered).to have_tag('p',    :text => 'content with nbsp')
+        unless Nokogiri::VERSION == '1.5.11'
+          expect(rendered).to have_tag('p',    :text => 'content with nbsp')
+        end
         expect(rendered).to have_tag('pre',  :text => " 1. bla   \n 2. bla ")
       end
 
@@ -425,9 +427,10 @@ describe 'have_tag' do
           with_text /sample with 'single' and "double" quotes/
         end
 
-
-        expect(rendered).to have_tag('p') do
-          with_text 'content with nbsp'
+        unless Nokogiri::VERSION == '1.5.11'
+          expect(rendered).to have_tag('p') do
+            with_text 'content with nbsp'
+          end
         end
 
         expect(rendered).to have_tag('pre') do
@@ -634,22 +637,22 @@ describe 'have_tag' do
 
     it 'with block parameters' do
       expect(rendered).to have_tag('div#one') do |a|
-        expect(a).to have_tag 'p.find_me', count: 2
+        expect(a).to have_tag 'p.find_me', :count => 2
 
-        expect(a).to have_tag 'b.nested', count: 3
-        expect(a).to have_tag('p.deep-nesting', count: 1) do |b|
-          expect(b).to have_tag 'b.nested', count: 2
+        expect(a).to have_tag 'b.nested', :count => 3
+        expect(a).to have_tag('p.deep-nesting', :count => 1) do |b|
+          expect(b).to have_tag 'b.nested', :count => 2
         end
       end
     end
 
     it 'with short_hand methods' do
       expect(rendered).to have_tag('div#one') do
-        with_tag 'p.find_me', count: 2
+        with_tag 'p.find_me', :count => 2
 
-        with_tag 'b.nested', count: 3
-        with_tag('p.deep-nesting', count: 1) do
-          with_tag 'b.nested', count: 2
+        with_tag 'b.nested', :count => 3
+        with_tag('p.deep-nesting', :count => 1) do
+          with_tag 'b.nested', :count => 2
         end
       end
     end

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.filter_run_excluding wip: true
+  config.filter_run_excluding :wip => true
 
   config.extend AssetHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -162,6 +162,7 @@ description: 'Nokogiri based ''have_tag'' and ''with_tag'' matchers for rspec 3.
 '
 email:
 - kucaahbe@ukr.net
+- randoum@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -174,6 +175,10 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - lib/rspec-html-matchers.rb
+- lib/rspec-html-matchers/have_tag.rb
+- lib/rspec-html-matchers/nokogiri_regexp_helper.rb
+- lib/rspec-html-matchers/nokogiri_text_helper.rb
+- lib/rspec-html-matchers/version.rb
 - spec/form_matchers_spec.rb
 - spec/have_empty_tag_spec.rb
 - spec/have_tag_spec.rb
@@ -192,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -200,17 +205,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 3
 test_files:
-- spec/form_matchers_spec.rb
+- spec/spec_helper.rb
 - spec/have_empty_tag_spec.rb
+- spec/form_matchers_spec.rb
 - spec/have_tag_spec.rb
-- spec/spec_helper.rb
-- spec/support/asset_helpers.rb
 - spec/support/raise_spec_error_helper.rb
+- spec/support/asset_helpers.rb
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/js_generated_content.feature