RubyGems - rspec-html-matchers - Versions diffs - 0.9.3 → 0.9.4 - Mend

rspec-html-matchers 0.9.3 → 0.9.4

Files changed (9) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +11 -0
data/lib/rspec-html-matchers/have_tag.rb +17 -1
data/lib/rspec-html-matchers/version.rb +1 -1
data/spec/form_matchers_spec.rb +18 -18
data/spec/have_empty_tag_spec.rb +3 -3
data/spec/have_tag_spec.rb +62 -14
data/spec/issues_spec.rb +1 -11
metadata +7 -7

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f037ee7285bbe655173850423adeba9e9825641718cc372e89669a5d02284d0
-  data.tar.gz: fc31002e7b48380897520cb09e0e08ee00151311c847b260d75cad9c2fab81f8
+  metadata.gz: c80050c4efaf8917fde81c8f5b139f846731b679f1a9001fec4a3e49690451b3
+  data.tar.gz: bc7e5523735f253a51fff1055e364f1189d7daa5dcedacf388612c4a57889e5a
 SHA512:
-  metadata.gz: a5b9f1f542091c493c69f402a46d54b6483a2f8c90e65c6fd8f7b038b14bc834cd76f8671e664323b37800f4a3e61afacf08d352963907c0873187521c8355cd
-  data.tar.gz: 5dd7980ad29b5ed66f3528366cc13b48199b809a0c025ed713cff6fb2f18f1a9323caa8c3bd6bc9145fea06d86c85c66b8763c560bb46377682c82d0dc7feff6
+  metadata.gz: 2febc5b59c123bd2e9232aecfb7839a047f29dbd0b30c0958378523bc04f3c119ad60923a7535def8c2748bb5f92793b47707a9db16ff864dc20696f7e8985d0
+  data.tar.gz: 38c6bf3867215196fd61a4877f8cabbd6bade0dc66ae4ae1edb00945b9d0ac6deecdbcdc0101530255347f6647c1e619f540a4cfe3fb6ca84d807fbf735b7ac6

data/CHANGELOG.md CHANGED

@@ -1,6 +1,17 @@
 Changelog
 =========
+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/lib/rspec-html-matchers/have_tag.rb CHANGED

@@ -79,7 +79,7 @@ module RSpecHtmlMatchers
       case src
       when String
-        parent_scope = Nokogiri::HTML::DocumentFragment.parse(src)
+        parent_scope = Nokogiri::HTML(src)
         @document    = src
       else
         parent_scope  = src.current_scope
@@ -207,12 +207,28 @@ module RSpecHtmlMatchers
     end
     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) && options[:blank] && options.key?(:text) # rubocop:disable Style/GuardClause, Style/IfUnlessModifier

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module RSpecHtmlMatchers
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/spec/form_matchers_spec.rb CHANGED

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'have_form' do
   asset 'form'
-  context 'without &block' do
+  context '[without &block]' do
     it 'should find form' do
       # sanity check
       expect(rendered).to have_form('/books', :post)
@@ -18,8 +18,8 @@ describe 'have_form' do
     end
   end
-  context 'with &block' do
-    context 'with_select' do
+  context '[with &block]' 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' })
@@ -34,7 +34,7 @@ describe 'have_form' do
         end
       end
-      context 'with_option' do
+      context '[with_option]' do
         it 'should find options' do
           expect(rendered).to have_form('/books', :post) do
             with_select('book[publisher_id]') do
@@ -57,7 +57,7 @@ describe 'have_form' do
         end
       end
-      context 'with_button' do
+      context '[with_button]' do
         it 'should find button' do
           expect(rendered).to have_form('/books', :post) do
             with_button('Cancel Book')
@@ -72,7 +72,7 @@ describe 'have_form' do
       end
     end
-    context 'with_hidden_field' do
+    context '[with_hidden_field]' do
       it 'should find hidden field' do
         expect(rendered).to have_form('/books', :post) do
           with_hidden_field('authenticity_token')
@@ -88,7 +88,7 @@ describe 'have_form' do
       end
     end
-    context 'with_text_field' do
+    context '[with_text_field]' do
       it 'should find text field' do
         expect(rendered).to have_form('/books', :post) do
           with_text_field('book[title]')
@@ -106,7 +106,7 @@ describe 'have_form' do
       end
     end
-    context 'with_email_field' do
+    context '[with_email_field]' do
       it 'should find email field' do
         expect(rendered).to have_form('/books', :post) do
           with_email_field('user[email]')
@@ -124,7 +124,7 @@ describe 'have_form' do
       end
     end
-    context 'with_url_field' do
+    context '[with_url_field]' do
       it 'should find url field' do
         expect(rendered).to have_form('/books', :post) do
           with_url_field('user[url]')
@@ -141,7 +141,7 @@ describe 'have_form' do
       end
     end
-    context 'with_number_field' do
+    context '[with_number_field]' do
       it 'should find number field' do
         expect(rendered).to have_form('/books', :post) do
           with_number_field('number')
@@ -160,7 +160,7 @@ describe 'have_form' do
       end
     end
-    context 'with_range_field' do
+    context '[with_range_field]' do
       it 'should find range field' do
         expect(rendered).to have_form('/books', :post) do
           with_range_field('range1', 1, 3)
@@ -179,7 +179,7 @@ describe 'have_form' do
       end
     end
-    context 'with_date_field' do
+    context '[with_date_field]' do
       it 'should find date field' do
         expect(rendered).to have_form('/books', :post) do
           with_date_field(:date)
@@ -213,7 +213,7 @@ describe 'have_form' do
       end
     end
-    context 'with_password_field' do
+    context '[with_password_field]' do
       it 'should find password field' do
         expect(rendered).to have_form('/books', :post) do
           with_password_field('user[password]')
@@ -227,7 +227,7 @@ describe 'have_form' do
       end
     end
-    context 'with_file_field' do
+    context '[with_file_field]' do
       it 'should find file field' do
         expect(rendered).to have_form('/books', :post) do
           with_file_field('form[file]')
@@ -241,7 +241,7 @@ describe 'have_form' do
       end
     end
-    context 'with_text_area' do
+    context '[with_text_area]' do
       it 'should find text area' do
         expect(rendered).to have_form('/books', :post) do
           with_text_area('book[description]')
@@ -255,7 +255,7 @@ describe 'have_form' do
       end
     end
-    context 'with_check_box' do
+    context '[with_check_box]' do
       it 'should find check box' do
         expect(rendered).to have_form('/books', :post) do
           with_checkbox('book[still_in_print]')
@@ -271,7 +271,7 @@ describe 'have_form' do
       end
     end
-    context 'with_radio_button' do
+    context '[with_radio_button]' do
       it 'should find radio button' do
         expect(rendered).to have_form('/books', :post) do
           with_radio_button('form[name]', 'true')
@@ -286,7 +286,7 @@ describe 'have_form' do
       end
     end
-    context 'with_submit' do
+    context '[with_submit]' do
       it 'should find submit' do
         expect(rendered).to have_form('/books', :post) do
           with_submit('Create Book')

data/spec/have_empty_tag_spec.rb CHANGED

@@ -4,7 +4,7 @@
 require 'spec_helper'
 describe 'have_empty_tag' do
-  context 'when single element' do
+  context '[single element]' do
     asset 'single_element'
     it { expect(rendered).to have_empty_tag('div') }
@@ -13,13 +13,13 @@ describe 'have_empty_tag' do
     it { expect(rendered).to have_empty_tag('div', :class => 'foo bar') }
   end
-  context 'when paragraphs' do
+  context '[paragraphs]' do
     asset 'paragraphs'
     it { expect(rendered).to_not have_empty_tag('p') }
   end
-  context 'when ordered list' do
+  context '[ordered list]' do
     asset 'ordered_list'
     it { expect(rendered).to_not have_empty_tag('html') }

data/spec/have_tag_spec.rb CHANGED

@@ -4,7 +4,7 @@
 require 'spec_helper'
 describe 'have_tag' do
-  context 'through css selector' do
+  context '[through css selector]' do
     asset 'search_and_submit'
     it 'should have right description' do
@@ -65,7 +65,7 @@ describe 'have_tag' do
       )
     end
-    context 'with additional HTML attributes(:with option)' do
+    context '[with additional HTML attributes(:with option)]' do
       it 'should find tags' do
         expect(rendered).to have_tag('input#search', :with => { :type => 'text' })
         expect(rendered).to have_tag(:input, :with => { :type => 'submit', :value => 'Save' })
@@ -115,7 +115,7 @@ describe 'have_tag' do
       end
     end
-    context 'with additional HTML attributes (:without option)' do
+    context '[with additional HTML attributes (:without option)]' do
       asset 'single_element'
       it 'should find tags that have classes specified via array (or string)' do
@@ -133,7 +133,7 @@ describe 'have_tag' do
     end
   end
-  context 'by count' do
+  context '[by count]' do
     asset 'paragraphs'
     it 'should have right description' do
@@ -279,10 +279,10 @@ describe 'have_tag' do
     end
   end
-  context 'with :text/:seen specified' do
+  context '[with :text/:seen specified]' do
     asset 'quotes'
-    context 'using standard syntax' do
+    context '[using standard syntax]' do
       it 'should find tags' do
         expect(rendered).to have_tag('div',  :text => 'sample text')
         expect(rendered).to have_tag('p',    :text => 'one')
@@ -358,7 +358,7 @@ describe 'have_tag' do
       end
     end
-    context 'using alternative syntax(with_text/without_text)' do
+    context '[using alternative syntax(with_text/without_text)]' do
       it 'should raise exception when used outside any other tag matcher' do
         expect {
           with_text 'sample text'
@@ -494,7 +494,7 @@ describe 'have_tag' do
     end
   end
-  context 'mixed matching' do
+  context '[mixed matching]' do
     asset 'special'
     it 'should find tags by count and exact content' do
@@ -535,7 +535,7 @@ describe 'have_tag' do
     end
   end
-  context 'nested matching:' do
+  context '[nested matching]' do
     asset 'ordered_list'
     it 'should find tags' do
@@ -585,7 +585,7 @@ describe 'have_tag' do
     end
   end
-  context 'deep nesting' do
+  context '[deep nesting]' do
     asset 'multiple_lists'
     it 'should allow deep nesting' do
@@ -624,7 +624,7 @@ describe 'have_tag' do
     end
   end
-  context 'find nested tags' do
+  context '[find nested tags]' do
     asset 'nested_matchers'
     it 'with block parameters' do
@@ -650,16 +650,16 @@ describe 'have_tag' do
     end
   end
-  context 'backwards compatibility for unnamed arguments' do
+  context '[backwards compatibility for unnamed arguments]' do
     asset 'quotes'
-    context 'string as second argument' do
+    context '[string as second argument]' do
       it 'should map a string argument to :text => string' do
         expect(rendered).to have_tag('div',  'sample text')
       end
     end
-    context 'Regexp as second argument' do
+    context '[Regexp as second argument]' do
       it 'should match against a valid Regexp' do
         expect(rendered).to have_tag('div',  /sample\s/)
       end
@@ -669,4 +669,52 @@ describe 'have_tag' do
       end
     end
   end
+  context '[html and body elements]' do
+    asset 'document'
+    context '[matching attributes]' do
+      it 'should find the html element with specified attributes' do
+        expect(rendered).to have_tag('html', :class => 'nojs')
+      end
+      it 'should find the body element with specified attributes' do
+        expect(rendered).to have_tag('body', :class => 'container')
+      end
+      it 'should not find the html element with specified attributes' do
+        expect(rendered).to have_tag('html', :class => 'nonexistent')
+      end
+      it 'should not find the body element with specified attributes' do
+        expect(rendered).to have_tag('body', :class => 'nonexistent')
+      end
+    end
+    context '[quirk: when no attributes specified, match is not intended to work]' do
+      it '<html> positive match should raise error' do
+        expect {
+          expect(rendered).to have_tag('html')
+        }.to raise_error(ArgumentError)
+      end
+      it '<html> negative match should raise error' do
+        expect {
+          expect(rendered).to_not have_tag('html')
+        }.to raise_error(ArgumentError)
+      end
+      it '<body> positive match should raise error' do
+        expect {
+          expect(rendered).to have_tag('body')
+        }.to raise_error(ArgumentError)
+      end
+      it '<body> negative match should raise error' do
+        expect {
+          expect(rendered).to_not have_tag('body')
+        }.to raise_error(ArgumentError)
+      end
+    end
+  end
 end

data/spec/issues_spec.rb CHANGED

@@ -4,17 +4,7 @@
 require 'spec_helper'
 describe 'working on github issues' do
-  describe '#62' do # https://github.com/kucaahbe/rspec-html-matchers/issues/62
-    it 'should not have html tag' do
-      expect('<p>My paragraph.</p>').not_to have_tag('html')
-    end
-    it 'should not have body tag' do
-      expect('<p>My paragraph.</p>').not_to have_tag('body')
-    end
-  end
-  it '#73' do # https://github.com/kucaahbe/rspec-html-matchers/issues/73
+  it '[seen Option Not Matching Seen Text (https://github.com/kucaahbe/rspec-html-matchers/issues/73)]' do
     rendered = <<HTML
       <p>
          content with ignored

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - kucaahbe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -187,7 +187,7 @@ dependencies:
 description: 'Nokogiri based ''have_tag'' and ''with_tag'' matchers for rspec 3. Does
   not depend on assert_select matcher, provides useful error messages.
-'
+  '
 email:
 - kucaahbe@ukr.net
 - randoum@gmail.com
@@ -233,17 +233,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 3
 test_files:
-- spec/support/raise_spec_error_helper.rb
-- spec/support/asset_helpers.rb
-- spec/have_empty_tag_spec.rb
 - spec/form_matchers_spec.rb
 - spec/spec_helper.rb
+- spec/have_empty_tag_spec.rb
 - spec/issues_spec.rb
+- spec/support/raise_spec_error_helper.rb
+- spec/support/asset_helpers.rb
 - spec/have_tag_spec.rb
 - features/support/env.rb
 - features/step_definitions/steps.rb