rspec-html-matchers 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c01ae28fa7cad1439746a9dd405d82c9e1d03b
-  data.tar.gz: 82a8b327805ab2b26e6bb8a06485d4b65442bda2
+  metadata.gz: 17c280c0fd064492e078852526a508bd84e6caca
+  data.tar.gz: 83887d4b20b714cfb7456b079960e3df4f3c5d53
 SHA512:
-  metadata.gz: 745e59864f28ec8bf28ec3ccef9da23c22d8bc03b3c8e4220412c54ec889b2cac59b32c2229051da5783c8be04f0443196324422f96c476292a6a98c0b2edc97
-  data.tar.gz: 097dcf96e8f5680a6dc45cd293909ea0e20e83e7b1c96694f71849588bb5b8ab9c7334e782e4f42f938d5753d47d98aafbed6ce84c2e945bcaa51cf4ea9f2e26
+  metadata.gz: 8abf7a4a88eb220f105603e528e4b75c7807caa1e3174a20e0c689276b484153c9724d810a5042beb71a9812681e97a04641a457f27d0078c2ac0c9dc309ade6
+  data.tar.gz: 784db376e190ad1f85d1bd181e3db36fe9dcdace86d516b906ce79f637abddc6800ab762225b83216506fe69d32f061fe787b70b029f4b50cb4f250054acfb5b

data/CHANGELOG.md

@@ -11,6 +11,19 @@ unreleased(TODO)
 * order matching
 * improve documentation, add more usage examples (look at changelog and code!)
 
+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
 -----
 

data/README.md

@@ -152,7 +152,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:

data/lib/rspec-html-matchers.rb

@@ -108,29 +108,31 @@ module RSpecHtmlMatchers
 
       case document
       when String
-        @parent_scope = @current_scope = Nokogiri::HTML(document).css(@tag)
+        @parent_scope = Nokogiri::HTML(document)
         @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
-
+      @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?
-        @current_scope = @parent_scope
-        @block.call if @block
+        @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)
@@ -309,14 +311,18 @@ module RSpecHtmlMatchers
     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
 
@@ -325,7 +331,9 @@ module RSpecHtmlMatchers
   # @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)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
+    end
   end
 
   # without_tag matcher
@@ -333,7 +341,9 @@ module RSpecHtmlMatchers
   # @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)
+    within_nested_tag do
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
+    end
   end
 
   # form assertion
@@ -458,14 +468,18 @@ module RSpecHtmlMatchers
     # TODO, should be: with_text_area name, text=nil
     #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 = { :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
@@ -493,7 +507,9 @@ module RSpecHtmlMatchers
     id = options[:with].delete(: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
@@ -501,7 +517,9 @@ module RSpecHtmlMatchers
     id = options[:with].delete(: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={}
@@ -517,7 +535,9 @@ module RSpecHtmlMatchers
     end
     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={}
@@ -533,7 +553,9 @@ module RSpecHtmlMatchers
     end
     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={}
@@ -544,7 +566,9 @@ module RSpecHtmlMatchers
     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={}
@@ -555,7 +579,9 @@ module RSpecHtmlMatchers
     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
@@ -573,11 +599,15 @@ module RSpecHtmlMatchers
   private
 
   def should_have_input(options)
-    expect(@__current_scope_for_nokogiri_matcher).to have_tag('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)
+    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
@@ -588,4 +618,11 @@ module RSpecHtmlMatchers
     return 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

data/spec/have_tag_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'have_tag' do
@@ -463,7 +463,7 @@ describe 'have_tag' do
             with_text 'SAMPLE text'
           end
         }.to raise_spec_error(
-          %Q{"SAMPLE text" expected within "div" in following template:\n<div>sample text</div>}
+          /"SAMPLE text" expected within "div" in following template:/
         )
 
         expect {
@@ -471,7 +471,7 @@ describe 'have_tag' do
             with_text /SAMPLE tekzt/i
           end
         }.to raise_spec_error(
-          %Q{/SAMPLE tekzt/i regexp expected within "div" in following template:\n<div>sample text</div>}
+          %r{/SAMPLE tekzt/i regexp expected within "div" in following template:}
         )
       end
 
@@ -481,7 +481,7 @@ describe 'have_tag' do
             without_text 'sample text'
           end
         }.to raise_spec_error(
-          %Q{"sample text" unexpected within "div" in following template:\n<div>sample text</div>\nbut was found.}
+          %r{"sample text" unexpected within "div" in following template:}
         )
 
         expect {
@@ -489,7 +489,7 @@ describe 'have_tag' do
             without_text /SAMPLE text/i
           end
         }.to raise_spec_error(
-          %Q{/SAMPLE text/i regexp unexpected within "div" in following template:\n<div>sample text</div>\nbut was found.}
+          %r{/SAMPLE text/i regexp unexpected within "div" in following template:}
         )
       end
 
@@ -578,15 +578,80 @@ describe 'have_tag' do
 
       expect {
         expect(rendered).to have_tag('ol') { with_tag('li'); with_tag('div') }
-      }.to raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have at least 1 element matching "div", found 0/)
+      }.to raise_spec_error(/to have at least 1 element matching "div", found 0/)
 
       expect {
         expect(rendered).to have_tag('ol') { with_tag('li'); with_tag('li', :count => 10) }
-      }.to raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have 10 element\(s\) matching "li", found 3/)
+      }.to raise_spec_error(/to have 10 element\(s\) matching "li", found 3/)
 
       expect {
         expect(rendered).to have_tag('ol') { with_tag('li'); with_tag('li', :text => /SAMPLE text/i) }
-      }.to raise_spec_error(/\/SAMPLE text\/i regexp expected within "li" in following template:\n#{ordered_list_regexp}/)
+      }.to raise_spec_error(/\/SAMPLE text\/i regexp expected within "li"/)
+    end
+  end
+
+  context "deep nesting" do
+    asset 'multiple_lists'
+
+    it "should allow deep nesting" do
+      expect(rendered).to have_tag('div') do
+        with_tag 'ul.numeric' do
+          with_tag 'li#one'
+        end
+      end
+    end
+
+    it "should clear context between nested tags" do
+      expect(rendered).to have_tag('div') do |div|
+        expect(div).to have_tag 'ul.numeric'
+        expect(div).to have_tag 'ul.alpha'
+      end
+    end
+
+    it "should narrow context when deep nesting" do
+      expect do
+        expect(rendered).to have_tag('div') do |div|
+          expect(div).to have_tag 'ul.numeric' do |ul_numeric|
+            expect(ul_numeric).to have_tag 'li#aye'
+          end
+        end
+      end .to raise_spec_error(/at least 1 element matching "li#aye", found 0/)
+    end
+
+    it "should narrow context for with_text" do
+      expect do
+        expect(rendered).to have_tag('div') do |div|
+          expect(div).to have_tag 'ul.numeric' do
+            with_text 'A'
+          end
+        end
+      end .to raise_spec_error(/"A" expected within "ul.numeric"/)
+    end
+  end
+
+  context 'find nested tags' do
+    asset 'nested_matchers'
+
+    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 '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 'b.nested', count: 3
+        with_tag('p.deep-nesting', count: 1) do
+          with_tag 'b.nested', count: 2
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -192,15 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rspec-html-matchers
-rubygems_version: 2.5.1
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 3
@@ -214,4 +214,3 @@ test_files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/js_generated_content.feature
-has_rdoc: