rspec-html-matchers 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9562deaafdea89229b40132a80f29ba68f3010738105688ba29ee42a245755e8
-  data.tar.gz: dd881bf03c6e5ab533eb9249d7d0450adf03ce7245f4e5ba430203cfbcb20b8f
+  metadata.gz: 1240c0b682d8f66bf9058191105b0264804359ab93edc3217251ebd28c76b8c9
+  data.tar.gz: a287233a778683a27fb2a22dfa5f4947707f442826c6780b0554ec9061127100
 SHA512:
-  metadata.gz: 2abbd53202a5cd53d43e564fa4ea7d5663703d22d04af4dd7f9fdce45a3e3621a9766440968d686c879643e3035f1c4b537d107db631fa0961f968931155431f
-  data.tar.gz: b17d9eb26651fb25389e024009369fa6cea40f36f7c0c911c8775e92cb96629a947308aada13dd427c99a22a462680ead185f36d80896bcc13dbf8229f84ca37
+  metadata.gz: ce5b239fe81a0deae7783c2698f5eecd173e24c903c1248774d2a7143b10d9d0841c05f16c36761e6844aa2dc8fc9c877ffcfdfb490cacb1522dbb9bd727e796
+  data.tar.gz: 20f258033ce55b259f5ff97d054f2a151e50a7365bb44853047c10f171f0b9c6007aff944a01b015d5bd4f26cae9f556cafbf5e9e78db90887744e480cd48d94

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 Changelog
 =========
 
+0.10.0
+------
+
+* relax rspec dependecy upper limit
+* add ruby 3.0 to test matrix
+* add ruby 3.1 to test matrix
+* remove 1.8 ruby from test matrix, this is the first step to remove it's support completely
+
+0.9.4
+-----
+* html/body matching from now is forbidden ([#75](https://github.com/kucaahbe/rspec-html-matchers/pull/75))
+* make ruby 2.7 possible to fail on CI
+
+0.9.3
+-----
+* fix for :seen option ([#73](https://github.com/kucaahbe/rspec-html-matchers/issues/73))
+* fix for html/body matching ([#62](https://github.com/kucaahbe/rspec-html-matchers/issues/62))
+* a bit of linting and refactoring
+
 0.9.2
 -----
 

data/README.md

@@ -1,6 +1,10 @@
-# rspec-html-matchers [![Gem Version](https://badge.fury.io/rb/rspec-html-matchers.svg)](https://badge.fury.io/rb/rspec-html-matchers) [![Build Status](https://travis-ci.com/kucaahbe/rspec-html-matchers.svg?branch=master)](https://travis-ci.com/kucaahbe/rspec-html-matchers)
+# rspec-html-matchers [![Gem Version](https://badge.fury.io/rb/rspec-html-matchers.svg)](https://badge.fury.io/rb/rspec-html-matchers)
 
-[RSpec 3](https://www.relishapp.com/rspec) matchers for testing your html (for [RSpec 2](https://www.relishapp.com/rspec/rspec-core/v/2-99/docs) use 0.5.x version).
+[RSpec](https://www.relishapp.com/rspec) matchers for testing your html (for [RSpec 2](https://www.relishapp.com/rspec/rspec-core/v/2-99/docs) use 0.5.x version).
+
+[![RSpec MRI](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/rspec-mri.yml/badge.svg)](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/rspec-mri.yml)
+[![RSpec JRuby](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/rspec-jruby.yml/badge.svg)](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/rspec-jruby.yml)
+[![Cucumber MRI](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/cucumber-mri.yml/badge.svg)](https://github.com/kucaahbe/rspec-html-matchers/actions/workflows/cucumber-mri.yml)
 
 Goals
 -----
@@ -41,7 +45,6 @@ describe "my view spec" do
   it "has tags" do
     expect(rendered).to have_tag('div')
   end
-
 end
 ```
 

data/features/step_definitions/steps.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Given /^I have following template:$/ do |string|
-  File.open($INDEX_HTML,'w+') do |file|
+  File.open($INDEX_HTML, 'w+') do |file| # rubocop:disable Style/GlobalVars
     file.write(string)
   end
 end

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # setup rspec matchers
 require 'rspec/expectations'
 World(RSpec::Matchers)
@@ -9,8 +11,9 @@ require 'selenium-webdriver'
 
 World RSpecHtmlMatchers
 
-$ASSETS_DIR = File.expand_path('../tmp',__FILE__)
-$INDEX_HTML = File.join($ASSETS_DIR,'index.html')
+# rubocop:disable Style/GlobalVars
+$ASSETS_DIR = File.expand_path('../tmp', __FILE__)
+$INDEX_HTML = File.join($ASSETS_DIR, 'index.html')
 
 class SimpleApp < Sinatra::Base
   set :public_folder, $ASSETS_DIR
@@ -39,3 +42,4 @@ end
 After do
   FileUtils.rm_rf $ASSETS_DIR
 end
+# rubocop:enable Style/GlobalVars

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

@@ -1,52 +1,51 @@
-# frozen_string_literal: true
 # encoding: UTF-8
+# frozen_string_literal: true
 
-module RSpecHtmlMatchers
+require 'nokogiri'
 
+module RSpecHtmlMatchers
   # @api
   # @private
-  class HaveTag
-    attr_reader :failure_message, :failure_message_when_negated
-    attr_reader :parent_scope, :current_scope
-
+  class HaveTag # rubocop:disable Metrics/ClassLength
     DESCRIPTIONS = {
-        :have_at_least_1 => %Q|have at least 1 element matching "%s"|,
-        :have_n          => %Q|have %i element(s) matching "%s"|
-    }
+      :have_at_least_1 => %(have at least 1 element matching "%s"),
+      :have_n          => %(have %i element(s) matching "%s"),
+    }.freeze
 
     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_tag         => %(expected following:\n%s\nto #{DESCRIPTIONS[:have_at_least_1]}, found 0.),
+      :unexpected_tag       => %(expected following:\n%s\nto NOT have element matching "%s", found %s.),
 
-        :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_count       => %(expected following:\n%s\nto #{DESCRIPTIONS[:have_n]}, found %s.),
+      :unexpected_count     => %(expected following:\n%s\nto NOT have %i element(s) matching "%s", but found.),
 
-        :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_btw_count   => %(expected following:\n%s\nto have at least %i and at most %i element(s) matching "%s", found %i.),
+      :unexpected_btw_count => %(expected following:\n%s\nto NOT have at least %i and 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_at_most     => %(expected following:\n%s\nto have at most %i element(s) matching "%s", found %i.),
+      :unexpected_at_most   => %(expected following:\n%s\nto NOT have at most %i element(s) matching "%s", but found %i.),
 
-        :expected_blank       => %Q|expected following template to contain empty tag %s:\n%s|,
-        :unexpected_blank     => %Q|expected following template to contain tag %s with other tags:\n%s|,
+      :expected_at_least    => %(expected following:\n%s\nto have at least %i element(s) matching "%s", found %i.),
+      :unexpected_at_least  => %(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_blank       => %(expected following template to contain empty tag %s:\n%s),
+      :unexpected_blank     => %(expected following template to contain tag %s with other tags:\n%s),
 
-        :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.|,
+      :expected_regexp      => %(%s regexp expected within "%s" in following template:\n%s),
+      :unexpected_regexp    => %(%s regexp 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!|,
-    }
+      :expected_text        => %("%s" expected within "%s" in following template:\n%s),
+      :unexpected_text      => %("%s" unexpected within "%s" in following template:\n%s\nbut was found.),
 
+      :wrong_count_error    => %(:count with :minimum or :maximum has no sence!),
+      :min_max_error        => %(:minimum should be less than :maximum!),
+      :bad_range_error      => %(Your :count range(%s) has no sence!),
+    }.freeze
 
-    def initialize tag, options={}, &block
-      @tag, @options, @block = tag.to_s, options, block
+    def initialize tag, options = {}, &block
+      @tag = tag.to_s
+      @options = options
+      @block = block
 
       if with_attrs = @options.delete(:with)
         if classes = with_attrs.delete(:class)
@@ -66,30 +65,35 @@ module RSpecHtmlMatchers
       end
 
       validate_options!
-      set_options
+      organize_options!
     end
 
-    def matches? document, &block
+    attr_reader :failure_message
+    attr_reader :failure_message_when_negated
+    attr_reader :current_scope
+
+    def matches? src, &block
       @block = block if block
 
-      document = document.html if defined?(Capybara::Session) && document.is_a?(Capybara::Session)
+      src = src.html if defined?(Capybara::Session) && src.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
+      case src
+      when String
+        parent_scope = Nokogiri::HTML(src)
+        @document    = src
+      else
+        parent_scope  = src.current_scope
+        @document     = parent_scope.to_html
       end
+
       @current_scope = begin
-                         @parent_scope.css(@tag)
+                         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 proper_content? and count_right?
+      if tag_presents? && proper_content? && count_right?
         @block.call(self) if @block
         true
       else
@@ -97,60 +101,74 @@ module RSpecHtmlMatchers
       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]
+      # TODO: should it be more complicated?
+      if options.key?(:count)
+        format(DESCRIPTIONS[:have_n], options[:count], tag)
       else
-        DESCRIPTIONS[:have_at_least_1] % @tag
+        DESCRIPTIONS[:have_at_least_1] % tag
       end
     end
 
     private
 
-    def classes_to_selector(classes)
+    attr_reader :tag
+    attr_reader :options
+    attr_reader :document
+
+    def classes_to_selector classes
       case classes
-        when Array
-          classes.join('.')
-        when String
-          classes.gsub(/\s+/, '.')
+      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
+      if current_scope.first
+        @count = current_scope.count
+        match_succeeded! :unexpected_tag, document, tag, @count
       else
-        @failure_message          = MESSAGES[:expected_tag] % [@document, @tag]
-        false
+        match_failed! :expected_tag, document, tag
       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)
+    def count_right? # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      case options[:count]
+      when Integer
+        if @count == options[:count]
+          match_succeeded! :unexpected_count, document, @count, tag
+        else
+          match_failed! :expected_count, document, options[:count], tag, @count
+        end
+      when Range
+        if options[:count].member? @count
+          match_succeeded! :unexpected_btw_count, document, options[:count].min, options[:count].max, tag, @count
+        else
+          match_failed! :expected_btw_count, document, options[:count].min, options[:count].max, tag, @count
+        end
+      when nil
+        if options[:maximum]
+          if @count <= options[:maximum]
+            match_succeeded! :unexpected_at_most, document, options[:maximum], tag, @count
+          else
+            match_failed! :expected_at_most, document, options[:maximum], tag, @count
+          end
+        elsif options[:minimum]
+          if @count >= options[:minimum]
+            match_succeeded! :unexpected_at_least, document, options[:minimum], tag, @count
           else
-            true
+            match_failed! :expected_at_least, document, options[:minimum], tag, @count
           end
+        else
+          true
+        end
       end
     end
 
     def proper_content?
-      if @options.key?(:blank)
+      if options.key?(:blank)
         maybe_empty?
       else
         text_right?
@@ -158,109 +176,115 @@ module RSpecHtmlMatchers
     end
 
     def maybe_empty?
-      if @options[:blank]
-        @failure_message_when_negated = MESSAGES[:unexpected_blank] % [@tag, @document]
-        @failure_message = MESSAGES[:expected_blank] % [@tag, @document]
+      if options[:blank] && current_scope.children.empty?
+        match_succeeded! :unexpected_blank, tag, document
       else
-        @failure_message_when_negated = MESSAGES[:expected_blank] % [@tag, @document]
-        @failure_message = MESSAGES[:unexpected_blank] % [@tag, @document]
-      end
-
-      if @options[:blank]
-        @current_scope.children.empty?
-      else
-        !@current_scope.children.empty?
+        match_failed! :expected_blank, tag, document
       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
+      return true unless options[:text]
+
+      case text = options[:text]
+      when Regexp
+        new_scope = current_scope.css(':regexp()', NokogiriRegexpHelper.new(text))
+        if new_scope.empty?
+          match_failed! :expected_regexp, text.inspect, tag, document
         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
+          @count = new_scope.count
+          match_succeeded! :unexpected_regexp, text.inspect, tag, document
+        end
+      else
+        new_scope = current_scope.css(':content()', NokogiriTextHelper.new(text, options[:squeeze_text]))
+        if new_scope.empty?
+          match_failed! :expected_text, text, tag, document
+        else
+          @count = new_scope.count
+          match_succeeded! :unexpected_text, text, tag, document
+        end
       end
     end
 
-    protected
-
     def validate_options!
+      validate_html_body_tags!
       validate_text_options!
       validate_count_presence!
       validate_count_when_set_min_max!
       validate_count_when_set_range!
     end
 
+    # here is a demo:
+    #   irb(main):009:0> Nokogiri::HTML('<p>asd</p>').xpath('//html')
+    #   => [#<Nokogiri::XML::Element:0x3fea02cd3f58 name="html" children=[#<Nokogiri::XML::Element:0x3fea02cd37c4 name="body" children=[#<Nokogiri::XML::Element:0x3fea02cd34e0 name="p" children=[#<Nokogiri::XML::Text:0x3fea02cd3134 "asd">]>]>]>]
+    #   irb(main):010:0> Nokogiri::HTML('<p>asd</p>').xpath('//body')
+    #   => [#<Nokogiri::XML::Element:0x3fea02ce3df4 name="body" children=[#<Nokogiri::XML::Element:0x3fea02ce3a70 name="p" children=[#<Nokogiri::XML::Text:0x3fea02ce350c "asd">]>]>]
+    #   irb(main):011:0> Nokogiri::HTML('<p>asd</p>').xpath('//p')
+    #   => [#<Nokogiri::XML::Element:0x3fea02cf3754 name="p" children=[#<Nokogiri::XML::Text:0x3fea02cf2f98 "asd">]>]
+    #   irb(main):012:0> Nokogiri::HTML('<p>asd</p>').xpath('//a')
+    #   => []
+    def validate_html_body_tags!
+      if %w[html body].include?(tag) && options.empty?
+        raise ArgumentError, 'matching <html> and <body> tags without specifying additional options does not work, see: https://github.com/kucaahbe/rspec-html-matchers/pull/75'
+      end
+    end
+
     def validate_text_options!
       # TODO: test these options validations
-      if @options.key?(:blank)
-        raise ':text option is not accepted when :blank => true' if @options[:blank] && @options.key?(:text)
+      if options.key?(:blank) && options[:blank] && options.key?(:text) # rubocop:disable Style/GuardClause, Style/IfUnlessModifier
+        raise ':text option is not accepted when :blank => true'
       end
     end
 
     def validate_count_presence!
-      raise 'wrong :count specified' unless [Range, NilClass].include?(@options[:count].class) or @options[:count].is_a?(Integer)
+      raise 'wrong :count specified' unless [Range, NilClass].include?(options[:count].class) || 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)
+        raise MESSAGES[:wrong_count_error] if options.key?(key) && options.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
+      raise MESSAGES[:min_max_error] if options[:minimum] > options[:maximum]
+    rescue NoMethodError # nil > 4 # rubocop:disable Lint/HandleExceptions
+    rescue ArgumentError # 2 < nil # rubocop:disable Lint/HandleExceptions
     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]
+        raise format(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' # rubocop:disable Lint/RescueType
+        raise format(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 format(MESSAGES[:bad_range_error], options[:count].to_s)
     end
 
     def count_is_range_but_no_min?
-      @options[:count] && @options[:count].is_a?(Range) &&
-          (@options[:count].min.nil? or @options[:count].min < 0)
+      options[:count].is_a?(Range) &&
+        (options[:count].min.nil? || (options[:count].min < 0))
     end
 
-    def set_options
+    def organize_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)
+      @options[:text] = @options[:text].to_s if @options.key?(:text) && !@options[:text].is_a?(Regexp)
 
-      if @options.has_key?(:seen) && !@options[:seen].is_a?(Regexp)
+      if @options.key?(:seen) && !@options[:seen].is_a?(Regexp) # rubocop:disable Style/GuardClause
         @options[:text] = @options[:seen].to_s
         @options[:squeeze_text] = true
       end
     end
 
-  end
+    def match_succeeded! message, *args
+      @failure_message_when_negated = format MESSAGES[message], *args
+      true
+    end
 
+    def match_failed! message, *args
+      @failure_message = format MESSAGES[message], *args
+      false
+    end
+  end
 end

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

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

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

@@ -1,8 +1,7 @@
-# frozen_string_literal: true
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module RSpecHtmlMatchers
-
   # @api
   # @private
   class NokogiriTextHelper
@@ -16,11 +15,10 @@ module RSpecHtmlMatchers
     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 = node.content.gsub(/\s+/, ' ').strip if @squeeze_text
 
         actual_content == @text
       end
     end
   end
-
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RSpecHtmlMatchers
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end