rspec-html-matchers 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8cc4b6854824aeacab03d525dc5a1b63cb1beb3d
-  data.tar.gz: c5d1a519855e7188533cf3967147d835fd4fd818
+SHA256:
+  metadata.gz: 9562deaafdea89229b40132a80f29ba68f3010738105688ba29ee42a245755e8
+  data.tar.gz: dd881bf03c6e5ab533eb9249d7d0450adf03ce7245f4e5ba430203cfbcb20b8f
 SHA512:
-  metadata.gz: 8216b50ce200d8cddb1071016529de18c311c2ad8ae34a99b3e7bda47d8560518fe58a10d78baaed350d4fc01a17a4dad05facb8bb914e16f46f56549b8d2c2c
-  data.tar.gz: d792ede080051791c628792831e345f3a00adfe1eeaf0fd94554e7c9b123454460672a00d63159a84289cdc77571d60d7f2901585d8be53f60a9e7bab35be680
+  metadata.gz: 2abbd53202a5cd53d43e564fa4ea7d5663703d22d04af4dd7f9fdce45a3e3621a9766440968d686c879643e3035f1c4b537d107db631fa0961f968931155431f
+  data.tar.gz: b17d9eb26651fb25389e024009369fa6cea40f36f7c0c911c8775e92cb96629a947308aada13dd427c99a22a462680ead185f36d80896bcc13dbf8229f84ca37

data/CHANGELOG.md

@@ -1,15 +1,18 @@
 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:
 
-* with_tag should raise error when used outside have_tag
-* add ability to have_form('/url', 'PUT') or have_form('/url', :PUT)
-* intelligent check comments(make sure it is not searching inside comments)
-* shouldn't show all markup in error message if it is too big
-* order matching
-* improve documentation, add more usage examples (look at changelog and code!)
+* 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
 -----
@@ -81,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
 -----
@@ -130,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
 -----
@@ -156,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
 -----
 
 * designed for testing **complex** html output. If you plan to perform simple matching, consider using:
-  * [assert_select](http://api.rubyonrails.org/classes/ActionDispatch/Assertions/SelectorAssertions.html#method-i-assert_select)
+  * [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)
@@ -55,7 +51,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 +81,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:
 
@@ -193,7 +189,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 +200,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 +214,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 +230,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/support/env.rb

@@ -4,6 +4,8 @@ World(RSpec::Matchers)
 require 'sinatra/base'
 require 'capybara/cucumber'
 require 'rspec-html-matchers'
+require 'webdrivers'
+require 'selenium-webdriver'
 
 World RSpecHtmlMatchers
 
@@ -14,7 +16,20 @@ 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

data/lib/rspec-html-matchers.rb

@@ -50,8 +50,13 @@ module RSpecHtmlMatchers
     @__current_scope_for_nokogiri_matcher = HaveTag.new(tag, options, &block)
   end
 
+  # 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(:text => ""))
+    have_tag(tag, options.merge(:blank => true))
   end
 
   def with_text text

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

@@ -30,6 +30,9 @@ module RSpecHtmlMatchers
         :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_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_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.|,
 
@@ -80,13 +83,13 @@ module RSpecHtmlMatchers
           @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?
+                         @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?
         @block.call(self) if @block
         true
       else
@@ -146,6 +149,30 @@ module RSpecHtmlMatchers
       end
     end
 
+    def proper_content?
+      if @options.key?(:blank)
+        maybe_empty?
+      else
+        text_right?
+      end
+    end
+
+    def maybe_empty?
+      if @options[:blank]
+        @failure_message_when_negated = MESSAGES[:unexpected_blank] % [@tag, @document]
+        @failure_message = MESSAGES[:expected_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?
+      end
+    end
+
     def text_right?
       return true unless @options[:text]
 
@@ -176,11 +203,19 @@ module RSpecHtmlMatchers
     protected
 
     def validate_options!
+      validate_text_options!
       validate_count_presence!
       validate_count_when_set_min_max!
       validate_count_when_set_range!
     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)
+      end
+    end
+
     def validate_count_presence!
       raise 'wrong :count specified' unless [Range, NilClass].include?(@options[:count].class) or @options[:count].is_a?(Integer)
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,21 +45,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -73,47 +87,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/asset_helpers.rb
 - spec/support/raise_spec_error_helper.rb
-homepage: http://github.com/kucaahbe/rspec-html-matchers
+homepage: https://github.com/kucaahbe/rspec-html-matchers
 licenses:
 - MIT
 metadata: {}
@@ -204,18 +218,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 3
 test_files:
+- spec/have_tag_spec.rb
+- spec/support/asset_helpers.rb
+- spec/support/raise_spec_error_helper.rb
 - spec/spec_helper.rb
 - spec/have_empty_tag_spec.rb
 - spec/form_matchers_spec.rb
-- spec/have_tag_spec.rb
-- spec/support/raise_spec_error_helper.rb
-- spec/support/asset_helpers.rb
-- features/step_definitions/steps.rb
 - features/support/env.rb
+- features/step_definitions/steps.rb
 - features/js_generated_content.feature