rspec-html-matchers 0.8.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95d16513be1c4d695f1c2dec1c2e43bcece4c97f
-  data.tar.gz: 523b06ab97e4993f5f79334447483c9121cadb7c
+SHA256:
+  metadata.gz: 0f037ee7285bbe655173850423adeba9e9825641718cc372e89669a5d02284d0
+  data.tar.gz: fc31002e7b48380897520cb09e0e08ee00151311c847b260d75cad9c2fab81f8
 SHA512:
-  metadata.gz: 5e49505a8a621e4d7c660827f5450efb92e5d320effadbc93d26a9391ee5a689710d45d4ef78b6339fdf374448820c2a5720a3a71b35c75f9167b67152671253
-  data.tar.gz: f7dbee862ebefebb529b1f99ad3c79e867ebe5535c8d1d3e79a21f9fc8c0e105cfbf2f4f6b5c5bf35350f715fae351e24b86b9bab986ee5a4cd07a6ca04bf6ba
+  metadata.gz: a5b9f1f542091c493c69f402a46d54b6483a2f8c90e65c6fd8f7b038b14bc834cd76f8671e664323b37800f4a3e61afacf08d352963907c0873187521c8355cd
+  data.tar.gz: 5dd7980ad29b5ed66f3528366cc13b48199b809a0c025ed713cff6fb2f18f1a9323caa8c3bd6bc9145fea06d86c85c66b8763c560bb46377682c82d0dc7feff6

data/CHANGELOG.md

@@ -1,15 +1,42 @@
 Changelog
 =========
 
-unreleased(TODO)
-----------------
+0.9.2
+-----
+
+* fixed have_empty_tag matcher on jruby
+* added ruby 2.7 to build matrix (no official support until stable release though)
+* added ruby 2.6 to build matrix ([#70](https://github.com/kucaahbe/rspec-html-matchers/pull/70))
+
+infrastructure/misc:
+
+* migrated to travis-ci.com instead of travis-ci.org (thanks [Hamada Takayuki](https://github.com/hamadata) for inspiration: [#70](https://github.com/kucaahbe/rspec-html-matchers/pull/70))
+* refactor travis-ci build setup
+* updated status badges to SVG (thanks to [Olle Jonsson](https://github.com/olleolleolle): [#71](https://github.com/kucaahbe/rspec-html-matchers/pull/71))
+
+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))
+* added ~> 2.4 ruby support
+* removed ~> 2 ruby support
+
+0.8.2
+-----
+
+* fixed README (thanks to [Rodrigo Castro](https://github.com/roooodcastro))
+* fixed deep nesting (thanks to [Misha Gorodnitzky](https://github.com/misaka))
+
+0.8.1
+-----
 
-* 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)
-* 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!)
+* Rspec differ fix (thanks to [Misha Gorodnitzky](https://github.com/misaka))
 
 0.8.0
 -----
@@ -57,7 +84,7 @@ unreleased(TODO)
 0.4.4
 -----
 
-* options for have_tag now support Regexp (thanks to [Ian C. Anderson](http://github.com/iancanderson))
+* options for have_tag now support Regexp (thanks to [Ian C. Anderson](https://github.com/iancanderson))
 
 0.4.3
 -----
@@ -106,14 +133,14 @@ unreleased(TODO)
 0.2.2
 -----
 
-* leading and trailing whitespaces are ignored in tags where they should be ignored(#11, and again thanks to [Simon Schoeters](http://github.com/cimm))
+* leading and trailing whitespaces are ignored in tags where they should be ignored(#11, and again thanks to [Simon Schoeters](https://github.com/cimm))
 * whitespaces ignoring as browser does in :text matching
 * have_tag backwards compability(thanks to [Felix Tjandrawibawa](https://github.com/cemeng), #12)
 
 0.2.1
 -----
 
-* make possible use non-string as :text option(#10, thanks for idea to [Simon Schoeters](http://github.com/cimm))
+* make possible use non-string as :text option(#10, thanks for idea to [Simon Schoeters](https://github.com/cimm))
 
 0.2.0
 -----
@@ -132,7 +159,7 @@ unreleased(TODO)
 0.0.6
 -----
 
-* allow for single quotes in content matchers (thanks to [Kelly Felkins](http://github.com/kellyfelkins)).
+* allow for single quotes in content matchers (thanks to [Kelly Felkins](https://github.com/kellyfelkins)).
 
 0.0.5 (trial-trip)
 ------------------

data/README.md

@@ -1,20 +1,16 @@
-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) [![Build Status](https://travis-ci.com/kucaahbe/rspec-html-matchers.svg?branch=master)](https://travis-ci.com/kucaahbe/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).
 
-[![Gem Version](https://badge.fury.io/rb/rspec-html-matchers.png)](http://badge.fury.io/rb/rspec-html-matchers)
-[![Build Status](https://travis-ci.org/kucaahbe/rspec-html-matchers.png)](http://travis-ci.org/kucaahbe/rspec-html-matchers)
-
 Goals
 -----
 
-* for testing **complicated** html output, for simple matching consider use:
-  * [assert_select](http://api.rubyonrails.org/classes/ActionDispatch/Assertions/SelectorAssertions.html#method-i-assert_select)
+* designed for testing **complex** html output. If you plan to perform simple matching, consider using:
+  * [assert_select](https://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)
+  * [matchers provided by capybara](https://rdoc.info/github/jnicklas/capybara/Capybara/Node/Matchers)
 * developer-friendly output in error messages
-* built on top of [nokogiri](http://www.nokogiri.org/)
+* built on top of [nokogiri](https://www.nokogiri.org/)
 * has support for [capybara](https://github.com/jnicklas/capybara), see below
 * syntax is similar to `have_tag` matcher from rspec-rails 1.x, but with own syntactic sugar
 * framework agnostic, as input should be `String` (or capybara's page, see below)
@@ -45,7 +41,6 @@ describe "my view spec" do
   it "has tags" do
     expect(rendered).to have_tag('div')
   end
-
 end
 ```
 
@@ -55,7 +50,7 @@ Cucumber configuration:
 World RSpecHtmlMatchers
 ```
 
-as this gem requires **nokogiri**, here are [instructions for installing it](http://nokogiri.org/tutorials/installing_nokogiri.html).
+as this gem requires **nokogiri**, here are [instructions for installing it](https://nokogiri.org/tutorials/installing_nokogiri.html).
 
 Usage
 -----
@@ -85,7 +80,7 @@ expect(rendered).to have_tag('form', :with => { :action => '/users', :method =>
 end
 ```
 
-Example above should be self-descriptive, if not, please refer to the [`have_tag`](http://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers%3Ahave_tag) documentation
+Example above should be self-descriptive, if not, please refer to the [`have_tag`](https://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers%3Ahave_tag) documentation
 
 Input can be any html string. Let's take a look at these examples:
 
@@ -152,7 +147,7 @@ Input can be any html string. Let's take a look at these examples:
   expect('<p> Some content&nbsphere</p>').to have_tag('p', :text => mymock.text)
   # or
   expect('<p> Some content&nbsphere</p>').to have_tag('p') do
-    with_content mymock.text
+    with_text mymock.text
   end
 
   # matching text content as it's seen by user:
@@ -193,7 +188,7 @@ where `page` is an instance of Capybara::Session
   - with\_date\_field
 
 and of course you can use the `without_` matchers,
-for more info take a look at [documentation](http://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers)
+for more info take a look at [documentation](https://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers)
 
 ### rspec 1 partial backwards compatibility:
 
@@ -204,7 +199,7 @@ expect(response).to have_tag('div', 'expected content')
 expect(response).to have_tag('div', /regexp matching expected content/)
 ```
 
-[RSpec 1 `have_tag` documentation](http://old.rspec.info/rails/writing/views.html)
+[RSpec 1 `have_tag` documentation](https://old.rspec.info/rails/writing/views.html)
 
 Matching Tag Attributes
 -----------------------
@@ -218,7 +213,7 @@ expect(index).to have_tag("img[alt!='']")
 More info
 ---------
 
-You can find more on [documentation](http://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers)
+You can find more on [documentation](https://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers)
 
 Also, please read [CHANGELOG](https://github.com/kucaahbe/rspec-html-matchers/blob/master/CHANGELOG.md) and [issues](https://github.com/kucaahbe/rspec-html-matchers/issues), might be helpful.
 
@@ -234,8 +229,8 @@ Contribution
 Contributors
 ============
 
-- [Kelly Felkins](http://github.com/kellyfelkins)
-- [Ryan Wilcox](http://github.com/rwilcox)
+- [Kelly Felkins](https://github.com/kellyfelkins)
+- [Ryan Wilcox](https://github.com/rwilcox)
 - [Simon Schoeters](https://github.com/cimm)
 - [Felix Tjandrawibawa](https://github.com/cemenghttps://github.com/cemeng)
 - [Szymon Przybył](https://github.com/apocalyptiq)

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,20 +1,38 @@
+# frozen_string_literal: true
+
 # setup rspec matchers
 require 'rspec/expectations'
 World(RSpec::Matchers)
 require 'sinatra/base'
 require 'capybara/cucumber'
 require 'rspec-html-matchers'
+require 'webdrivers'
+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
 end
 
-Capybara.default_driver = :selenium
+Capybara.register_driver :headless_chrome do |app|
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument('--headless')
+  options.add_argument('--disable-gpu')
+  options.add_argument('--window-size=800,600')
+
+  Capybara::Selenium::Driver.new(app, :browser => :chrome, :options => options)
+end
+
+Capybara.configure do |config|
+  config.default_max_wait_time = 15 if config.respond_to? :default_max_wait_time=
+  config.default_driver = :headless_chrome
+end
+
 Capybara.app = SimpleApp
 
 Before do
@@ -24,3 +42,4 @@ end
 After do
   FileUtils.rm_rf $ASSETS_DIR
 end
+# rubocop:enable Style/GlobalVars

data/lib/rspec-html-matchers.rb

@@ -1,266 +1,30 @@
-# frozen_string_literal: true
 # encoding: UTF-8
-require 'rspec'
-require 'nokogiri'
+# frozen_string_literal: true
 
+require 'rspec-html-matchers/nokogiri_regexp_helper'
+require 'rspec-html-matchers/nokogiri_text_helper'
+require 'rspec-html-matchers/have_tag'
+
+# RSpec global configuration:
+#
+#   RSpec.configure do |config|
+#     config.include RSpecHtmlMatchers
+#   end
+#
+# RSpec per-test configuration
+#
+#   RSpec.describe "my view spec" do
+#     include RSpecHtmlMatchers
+#
+#     it "has tags" do
+#       expect(rendered).to have_tag('div')
+#     end
+#   end
+#
+# Cucumber configuration:
+#
+#   World RSpecHtmlMatchers
 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 = @current_scope = Nokogiri::HTML(document).css(@tag)
-        @document     = document
-      else
-        @parent_scope  = document.current_scope
-        @current_scope = begin
-                           document.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
-        @document      = @parent_scope.to_html
-      end
-
-      if tag_presents? and text_right? and count_right?
-        @current_scope = @parent_scope
-        @block.call if @block
-        true
-      else
-        false
-      end
-    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
-
   # tag assertion, this is the core of functionality, other matchers are shortcuts to this matcher
   #
   # @yield block where you should put with_tag, without_tag and/or other matchers
@@ -295,45 +59,60 @@ module RSpecHtmlMatchers
   #    </html>").to have_tag('body') { with_tag('h1', :text => 'some html document') }
   #   expect('<div class="one two">').to have_tag('div', :with => { :class => ['two', 'one'] })
   #   expect('<div class="one two">').to have_tag('div', :with => { :class => 'two one' })
-  def have_tag tag, options={}, &block
+  def have_tag tag, options = {}, &block
     # for backwards compatibility with rpecs have tag:
-    options = { :text => options } if options.kind_of?(String) || options.kind_of?(Regexp)
+    options = { :text => options } if options.is_a?(String) || options.is_a?(Regexp)
     @__current_scope_for_nokogiri_matcher = HaveTag.new(tag, options, &block)
   end
 
-  def have_empty_tag tag, options={}
-    have_tag(tag, options.merge(text: ""))
+  # tests whether tag have any content inside
+  #
+  # @example
+  #   expect('<div></div>').to have_empty_tag('div') # success
+  #   expect('<div>hi</div>').to have_empty_tag('div') # fail
+  def have_empty_tag tag, options = {}
+    have_tag(tag, options.merge(:blank => true))
   end
 
   def with_text text
     raise StandardError, 'this matcher should be used inside "have_tag" matcher block' unless defined?(@__current_scope_for_nokogiri_matcher)
     raise ArgumentError, 'this matcher does not accept block' if block_given?
+
     tag = @__current_scope_for_nokogiri_matcher.instance_variable_get(:@tag)
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, :text => text)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, :text => text)
+    end
   end
 
   def without_text text
     raise StandardError, 'this matcher should be used inside "have_tag" matcher block' unless defined?(@__current_scope_for_nokogiri_matcher)
     raise ArgumentError, 'this matcher does not accept block' if block_given?
+
     tag = @__current_scope_for_nokogiri_matcher.instance_variable_get(:@tag)
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, :text => text)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, :text => text)
+    end
   end
-  alias :but_without_text :without_text
+  alias but_without_text without_text
 
   # with_tag matcher
   # @yield block where you should put other with_tag or without_tag
   # @see #have_tag
   # @note this should be used within block of have_tag matcher
-  def with_tag tag, options={}, &block
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
+  def with_tag tag, options = {}, &block
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
+    end
   end
 
   # without_tag matcher
   # @yield block where you should put other with_tag or without_tag
   # @see #have_tag
   # @note this should be used within block of have_tag matcher
-  def without_tag tag, options={}, &block
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
+  def without_tag tag, options = {}, &block
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
+    end
   end
 
   # form assertion
@@ -342,250 +121,275 @@ module RSpecHtmlMatchers
   #   have_tag 'form', :with => { :action => action_url, :method => method ... }
   # @yield block with with_<field>, see below
   # @see #have_tag
-  def have_form action_url, method, options={}, &block
+  def have_form action_url, method, options = {}, &block
     options[:with] ||= {}
     id = options[:with].delete(:id)
-    tag = 'form'; tag += '#'+id if id
+    tag = 'form'; tag += '#' + id if id
     options[:with].merge!(:action => action_url)
     options[:with].merge!(:method => method.to_s)
     have_tag tag, options, &block
   end
 
-  #@TODO fix code duplications
+  # @TODO fix code duplications
 
-  def with_hidden_field name, value=nil
-    options = form_tag_options('hidden',name,value)
+  def with_hidden_field name, value = nil
+    options = form_tag_options('hidden', name, value)
     should_have_input(options)
   end
 
-  def without_hidden_field name, value=nil
-    options = form_tag_options('hidden',name,value)
+  def without_hidden_field name, value = nil
+    options = form_tag_options('hidden', name, value)
     should_not_have_input(options)
   end
 
-  def with_text_field name, value=nil
-    options = form_tag_options('text',name,value)
+  def with_text_field name, value = nil
+    options = form_tag_options('text', name, value)
     should_have_input(options)
   end
 
-  def without_text_field name, value=nil
-    options = form_tag_options('text',name,value)
+  def without_text_field name, value = nil
+    options = form_tag_options('text', name, value)
     should_not_have_input(options)
   end
 
-  def with_email_field name, value=nil
-    options = form_tag_options('email',name,value)
+  def with_email_field name, value = nil
+    options = form_tag_options('email', name, value)
     should_have_input(options)
   end
 
-  def without_email_field name, value=nil
-    options = form_tag_options('email',name,value)
+  def without_email_field name, value = nil
+    options = form_tag_options('email', name, value)
     should_not_have_input(options)
   end
 
-  def with_url_field name, value=nil
-    options = form_tag_options('url',name,value)
+  def with_url_field name, value = nil
+    options = form_tag_options('url', name, value)
     should_have_input(options)
   end
 
-  def without_url_field name, value=nil
-    options = form_tag_options('url',name,value)
+  def without_url_field name, value = nil
+    options = form_tag_options('url', name, value)
     should_not_have_input(options)
   end
 
-  def with_number_field name, value=nil
-    options = form_tag_options('number',name,value)
+  def with_number_field name, value = nil
+    options = form_tag_options('number', name, value)
     should_have_input(options)
   end
 
-  def without_number_field name, value=nil
-    options = form_tag_options('number',name,value)
+  def without_number_field name, value = nil
+    options = form_tag_options('number', name, value)
     should_not_have_input(options)
   end
 
-  def with_range_field name, min, max, options={}
-    options = { :with => { :name => name, :type => 'range', :min => min.to_s, :max => max.to_s }.merge(options.delete(:with)||{}) }
+  def with_range_field name, min, max, options = {}
+    options = { :with => { :name => name, :type => 'range', :min => min.to_s, :max => max.to_s }.merge(options.delete(:with) || {}) }
     should_have_input(options)
   end
 
-  def without_range_field name, min=nil, max=nil, options={}
-    options = { :with => { :name => name, :type => 'range' }.merge(options.delete(:with)||{}) }
+  def without_range_field name, min = nil, max = nil, options = {}
+    options = { :with => { :name => name, :type => 'range' }.merge(options.delete(:with) || {}) }
     options[:with].merge!(:min => min.to_s) if min
     options[:with].merge!(:max => max.to_s) if max
     should_not_have_input(options)
   end
 
-  DATE_FIELD_TYPES = %w( date month week time datetime datetime-local )
+  DATE_FIELD_TYPES = %w[date month week time datetime datetime-local].freeze
 
-  def with_date_field date_field_type, name=nil, options={}
+  def with_date_field date_field_type, name = nil, options = {}
     date_field_type = date_field_type.to_s
     raise "unknown type `#{date_field_type}` for date picker" unless DATE_FIELD_TYPES.include?(date_field_type)
-    options = { :with => { :type => date_field_type.to_s }.merge(options.delete(:with)||{}) }
+
+    options = { :with => { :type => date_field_type.to_s }.merge(options.delete(:with) || {}) }
     options[:with].merge!(:name => name.to_s) if name
     should_have_input(options)
   end
 
-  def without_date_field date_field_type, name=nil, options={}
+  def without_date_field date_field_type, name = nil, options = {}
     date_field_type = date_field_type.to_s
     raise "unknown type `#{date_field_type}` for date picker" unless DATE_FIELD_TYPES.include?(date_field_type)
-    options = { :with => { :type => date_field_type.to_s }.merge(options.delete(:with)||{}) }
+
+    options = { :with => { :type => date_field_type.to_s }.merge(options.delete(:with) || {}) }
     options[:with].merge!(:name => name.to_s) if name
     should_not_have_input(options)
   end
 
-  def with_password_field name, value=nil
-    # TODO add ability to explicitly say that value should be empty
-    options = form_tag_options('password',name,value)
+  def with_password_field name, value = nil
+    # TODO: add ability to explicitly say that value should be empty
+    options = form_tag_options('password', name, value)
     should_have_input(options)
   end
 
-  def without_password_field name, value=nil
-    options = form_tag_options('password',name,value)
+  def without_password_field name, value = nil
+    options = form_tag_options('password', name, value)
     should_not_have_input(options)
   end
 
-  def with_file_field name, value=nil
-    options = form_tag_options('file',name,value)
+  def with_file_field name, value = nil
+    options = form_tag_options('file', name, value)
     should_have_input(options)
   end
 
-  def without_file_field name, value=nil
-    options = form_tag_options('file',name,value)
+  def without_file_field name, value = nil
+    options = form_tag_options('file', name, value)
     should_not_have_input(options)
   end
 
   def with_text_area name
     # TODO, should be: with_text_area name, text=nil
-    #options = form_tag_options('text',name,value)
+    # options = form_tag_options('text',name,value)
     options = { :with => { :name => name } }
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag('textarea', options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('textarea', options)
+    end
   end
 
   def without_text_area name
     # TODO, should be: without_text_area name, text=nil
-    #options = form_tag_options('text',name,value)
+    # options = form_tag_options('text',name,value)
     options = { :with => { :name => name } }
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('textarea', options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('textarea', options)
+    end
   end
 
-  def with_checkbox name, value=nil
-    options = form_tag_options('checkbox',name,value)
+  def with_checkbox name, value = nil
+    options = form_tag_options('checkbox', name, value)
     should_have_input(options)
   end
 
-  def without_checkbox name, value=nil
-    options = form_tag_options('checkbox',name,value)
+  def without_checkbox name, value = nil
+    options = form_tag_options('checkbox', name, value)
     should_not_have_input(options)
   end
 
   def with_radio_button name, value
-    options = form_tag_options('radio',name,value)
+    options = form_tag_options('radio', name, value)
     should_have_input(options)
   end
 
   def without_radio_button name, value
-    options = form_tag_options('radio',name,value)
+    options = form_tag_options('radio', name, value)
     should_not_have_input(options)
   end
 
-  def with_select name, options={}, &block
+  def with_select name, options = {}, &block
     options[:with] ||= {}
     id = options[:with].delete(:id)
-    tag='select'; tag += '#'+id if id
+    tag = 'select'; tag += '#' + id if id
     options[:with].merge!(:name => name)
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
+    end
   end
 
-  def without_select name, options={}, &block
+  def without_select name, options = {}, &block
     options[:with] ||= {}
     id = options[:with].delete(:id)
-    tag='select'; tag += '#'+id if id
+    tag = 'select'; tag += '#' + id if id
     options[:with].merge!(:name => name)
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
+    end
   end
 
-  def with_option text, value=nil, options={}
+  def with_option text, value = nil, options = {}
     options[:with] ||= {}
     if value.is_a?(Hash)
       options.merge!(value)
-      value=nil
+      value = nil
     end
-    tag='option'
+    tag = 'option'
     options[:with].merge!(:value => value.to_s) if value
-    if options[:selected]
-      options[:with].merge!(:selected => "selected")
-    end
+    options[:with].merge!(:selected => 'selected') if options[:selected]
     options.delete(:selected)
     options.merge!(:text => text) if text
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options)
+    end
   end
 
-  def without_option text, value=nil, options={}
+  def without_option text, value = nil, options = {}
     options[:with] ||= {}
     if value.is_a?(Hash)
       options.merge!(value)
-      value=nil
+      value = nil
     end
-    tag='option'
+    tag = 'option'
     options[:with].merge!(:value => value.to_s) if value
-    if options[:selected]
-      options[:with].merge!(:selected => "selected")
-    end
+    options[:with].merge!(:selected => 'selected') if options[:selected]
     options.delete(:selected)
     options.merge!(:text => text) if text
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options)
+    end
   end
 
-  def with_button text, value=nil, options={}
+  def with_button text, value = nil, options = {}
     options[:with] ||= {}
     if value.is_a?(Hash)
       options.merge!(value)
-      value=nil
+      value = nil
     end
     options[:with].merge!(:value => value.to_s) if value
     options.merge!(:text => text) if text
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag('button', options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('button', options)
+    end
   end
 
-  def without_button text, value=nil, options={}
+  def without_button text, value = nil, options = {}
     options[:with] ||= {}
     if value.is_a?(Hash)
       options.merge!(value)
-      value=nil
+      value = nil
     end
     options[:with].merge!(:value => value.to_s) if value
     options.merge!(:text => text) if text
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('button', options)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('button', options)
+    end
   end
 
   def with_submit value
     options = { :with => { :type => 'submit', :value => value } }
-    #options = form_tag_options('text',name,value)
+    # options = form_tag_options('text',name,value)
     should_have_input(options)
   end
 
   def without_submit value
-    #options = form_tag_options('text',name,value)
+    # options = form_tag_options('text',name,value)
     options = { :with => { :type => 'submit', :value => value } }
     should_not_have_input(options)
   end
 
   private
 
-  def should_have_input(options)
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag('input', options)
+  def should_have_input options
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('input', options)
+    end
   end
 
-  def should_not_have_input(options)
-    expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('input', options)
+  def should_not_have_input options
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('input', options)
+    end
   end
 
   # form_tag in method name name mean smth. like input, submit, tags that should appear in a form
-  def form_tag_options form_tag_type, form_tag_name, form_tag_value=nil
+  def form_tag_options form_tag_type, form_tag_name, form_tag_value = nil
     options = { :with => { :name => form_tag_name, :type => form_tag_type } }
     # .to_s if value is a digit or smth. else, see issue#10
     options[:with].merge!(:value => form_tag_value.to_s) if form_tag_value
-    return options
+    options
   end
 
+  def within_nested_tag &block
+    raise 'block needed' unless block_given?
+
+    parent_scope = @__current_scope_for_nokogiri_matcher
+    block.call
+    @__current_scope_for_nokogiri_matcher = parent_scope
+  end
 end