rspec-html-matchers 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61a10851ace0712b7207d446f43cde42af550c0
-  data.tar.gz: 9732c49d3720bb2b14aa3c31eff82f83c259b12b
+  metadata.gz: 296097fee852e60651a274cfd9091e6955692619
+  data.tar.gz: 9227a593e13a62fa110a2b7bfba1b12acda14e00
 SHA512:
-  metadata.gz: 61822c3ee0067e015ca243c0c1ffd4d706febb4a0b01daf929c248229befeb9419f971b5967a46178bd3bef14e11c62757dc6e2c198141a8ed7a580315e9924c
-  data.tar.gz: 5b05ffd9c02613e165b1407eaec75784ec3944ed5cbd4e1be8306fdd946a3b4d0a96574b558cb8f1c867cd75dcf2f6e0bd99ce106e9ca826a9e88798975c1204
+  metadata.gz: d0bbf6faa8f79666a0688d0e16a8fc26ead1662a80640df0198e222330b0a19d696b2e7a115bb7c9ec119efee7872446c6b34eb8fa6814d1f431d72a4192a1b0
+  data.tar.gz: f6a6383d51769a300304847fe71e0896e37769671fc82dc24591dfb551b460d5d0874464dc2c0a02af67ae5b7d284455602385cafb3c1cc7237415e45342cbea

data/CHANGELOG.md

@@ -11,6 +11,11 @@ unreleased(TODO)
 * order matching
 * improve documentation, add more usage examples (look at changelog and code!)
 
+0.6.0
+-----
+
+* introduced rspec 3.0.0 compatibility (thanks to [Tiago](https://github.com/TiagoCardoso1983))
+
 0.5.0
 -----
 

data/README.md

@@ -1,7 +1,7 @@
 rspec-html-matchers
 ===================
 
-[RSpec 2](https://www.relishapp.com/rspec) matchers for testing your html.
+[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)

data/features/step_definitions/steps.rb

@@ -10,18 +10,18 @@ end
 
 Then /^I should be able to match static content$/ do
   # capybara:
-  page.should have_content('Hello World!')
-  page.should have_css('h1')
+  expect(page).to have_content('Hello World!')
+  expect(page).to have_css('h1')
 
-  # rspec2 matchers:
-  page.should have_tag('h1', :text => 'Hello World!')
+  # rspec-html-matchers:
+  expect(page).to have_tag('h1', :text => 'Hello World!')
 end
 
 Then /^I should be able to match javascript generated content$/ do
   # capybara:
-  page.should have_content('Hello Another World!')
-  page.should have_css('p')
+  expect(page).to have_content('Hello Another World!')
+  expect(page).to have_css('p')
 
-  # rspec2 matchers:
-  page.should have_tag('p', :text => 'Hello Another World!')
+  # rspec-html-matchers:
+  expect(page).to have_tag('p', :text => 'Hello Another World!')
 end

data/features/support/env.rb

@@ -1,3 +1,6 @@
+# setup rspec matchers
+require 'rspec/expectations'
+World(RSpec::Matchers)
 require 'sinatra/base'
 require 'capybara/cucumber'
 require 'rspec-html-matchers'

data/lib/rspec-html-matchers.rb

@@ -1,8 +1,9 @@
 # encoding: UTF-8
+require 'rspec'
 require 'nokogiri'
 
 module RSpec
-  module Matchers
+  module HtmlMatchers
 
     # @api
     # @private
@@ -20,53 +21,59 @@ module RSpec
     # @api
     # @private
     class NokogiriTextHelper
+      NON_BREAKING_SPACE = "\u00a0"
+
       def initialize text
         @text = text
       end
 
       def content node_set
-        match_text = @text.gsub(/\\000027/, "'")
         node_set.find_all do |node|
-          actual_content = node.content
-          # remove non-breaking spaces:
-          case RUBY_VERSION
-          # 1.9.x 2.x.x rubies
-          when /^(1\.9|2)/
-            actual_content.gsub!(/\u00a0/, ' ')
-          when /^1\.8/
-            actual_content.gsub!("\302\240", ' ')
-          end
+          actual_content = node.content.gsub(NON_BREAKING_SPACE, ' ')
 
-          actual_content == match_text
+          actual_content == @text
         end
       end
     end
 
     # @api
     # @private
-    class NokogiriMatcher
-      attr_reader :failure_message, :negative_failure_message
+    class HaveTag
+      attr_reader :failure_message, :failure_message_when_negated
       attr_reader :parent_scope, :current_scope
 
-      TAG_FOUND_DESC           = %Q|have at least 1 element matching "%s"|
-      TAG_NOT_FOUND_MSG        = %Q|expected following:\n%s\nto #{TAG_FOUND_DESC}, found 0.|
-      TAG_FOUND_MSG            = %Q|expected following:\n%s\nto NOT have element matching "%s", found %s.|
-      COUNT_DESC               = %Q|have %s element(s) matching "%s"|
-      WRONG_COUNT_MSG          = %Q|expected following:\n%s\nto #{COUNT_DESC}, found %s.|
-      RIGHT_COUNT_MSG          = %Q|expected following:\n%s\nto NOT have %s element(s) matching "%s", but found.|
-      BETWEEN_COUNT_MSG        = %Q|expected following:\n%s\nto have at least %s and at most %s element(s) matching "%s", found %s.|
-      RIGHT_BETWEEN_COUNT_MSG  = %Q|expected following:\n%s\nto NOT have at least %s and at most %s element(s) matching "%s", but found %s.|
-      AT_MOST_MSG              = %Q|expected following:\n%s\nto have at most %s element(s) matching "%s", found %s.|
-      RIGHT_AT_MOST_MSG        = %Q|expected following:\n%s\nto NOT have at most %s element(s) matching "%s", but found %s.|
-      AT_LEAST_MSG             = %Q|expected following:\n%s\nto have at least %s element(s) matching "%s", found %s.|
-      RIGHT_AT_LEAST_MSG       = %Q|expected following:\n%s\nto NOT have at least %s element(s) matching "%s", but found %s.|
-      REGEXP_NOT_FOUND_MSG     = %Q|%s regexp expected within "%s" in following template:\n%s|
-      REGEXP_FOUND_MSG         = %Q|%s regexp unexpected within "%s" in following template:\n%s\nbut was found.|
-      TEXT_NOT_FOUND_MSG       = %Q|"%s" expected within "%s" in following template:\n%s|
-      TEXT_FOUND_MSG           = %Q|"%s" unexpected within "%s" in following template:\n%s\nbut was found.|
-      WRONG_COUNT_ERROR_MSG    = %Q|:count with :minimum or :maximum has no sence!|
-      MIN_MAX_ERROR_MSG        = %Q|:minimum shold be less than :maximum!|
-      BAD_RANGE_ERROR_MSG      = %Q|Your :count range(%s) has no sence!|
+      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
@@ -124,9 +131,9 @@ module RSpec
       def description
         # TODO should it be more complicated?
         if @options.has_key?(:count)
-          COUNT_DESC % [@options[:count],@tag]
+          DESCRIPTIONS[:have_n] % [@options[:count],@tag]
         else
-          TAG_FOUND_DESC % @tag
+          DESCRIPTIONS[:have_at_least_1] % @tag
         end
       end
 
@@ -144,10 +151,10 @@ module RSpec
       def tag_presents?
         if @current_scope.first
           @count = @current_scope.count
-          @negative_failure_message = TAG_FOUND_MSG % [@document, @tag, @count]
+          @failure_message_when_negated = MESSAGES[:unexpected_tag] % [@document, @tag, @count]
           true
         else
-          @failure_message          = TAG_NOT_FOUND_MSG % [@document, @tag]
+          @failure_message          = MESSAGES[:expected_tag] % [@document, @tag]
           false
         end
       end
@@ -155,14 +162,14 @@ module RSpec
       def count_right?
         case @options[:count]
         when Integer
-          ((@negative_failure_message=RIGHT_COUNT_MSG % [@document,@count,@tag]) && @count == @options[:count]) || (@failure_message=WRONG_COUNT_MSG % [@document,@options[:count],@tag,@count]; false)
+          ((@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
-          ((@negative_failure_message=RIGHT_BETWEEN_COUNT_MSG % [@document,@options[:count].min,@options[:count].max,@tag,@count]) && @options[:count].member?(@count)) || (@failure_message=BETWEEN_COUNT_MSG % [@document,@options[:count].min,@options[:count].max,@tag,@count]; false)
+          ((@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]
-            ((@negative_failure_message=RIGHT_AT_MOST_MSG % [@document,@options[:maximum],@tag,@count]) && @count <= @options[:maximum]) || (@failure_message=AT_MOST_MSG % [@document,@options[:maximum],@tag,@count]; false)
+            ((@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]
-            ((@negative_failure_message=RIGHT_AT_LEAST_MSG % [@document,@options[:minimum],@tag,@count]) && @count >= @options[:minimum]) || (@failure_message=AT_LEAST_MSG % [@document,@options[:minimum],@tag,@count]; false)
+            ((@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
@@ -177,20 +184,20 @@ module RSpec
           new_scope = @current_scope.css(':regexp()',NokogiriRegexpHelper.new(text))
           unless new_scope.empty?
             @count = new_scope.count
-            @negative_failure_message = REGEXP_FOUND_MSG % [text.inspect,@tag,@document]
+            @failure_message_when_negated = MESSAGES[:unexpected_regexp] % [text.inspect,@tag,@document]
             true
           else
-            @failure_message          = REGEXP_NOT_FOUND_MSG % [text.inspect,@tag,@document]
+            @failure_message          = MESSAGES[:expected_regexp] % [text.inspect,@tag,@document]
             false
           end
         else
           new_scope = @current_scope.css(':content()',NokogiriTextHelper.new(text))
           unless new_scope.empty?
             @count = new_scope.count
-            @negative_failure_message = TEXT_FOUND_MSG % [text,@tag,@document]
+            @failure_message_when_negated = MESSAGES[:unexpected_text] % [text,@tag,@document]
             true
           else
-            @failure_message          = TEXT_NOT_FOUND_MSG % [text,@tag,@document]
+            @failure_message          = MESSAGES[:expected_text] % [text,@tag,@document]
             false
           end
         end
@@ -202,23 +209,23 @@ module RSpec
         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 WRONG_COUNT_ERROR_MSG if @options.has_key?(key) and @options.has_key?(:count)
+          raise MESSAGES[:wrong_count_error] if @options.has_key?(key) and @options.has_key?(:count)
         end
 
         begin
-          raise MIN_MAX_ERROR_MSG if @options[:minimum] > @options[:maximum]
+          raise MESSAGES[:min_max_error] if @options[:minimum] > @options[:maximum]
         rescue NoMethodError # nil > 4
         rescue ArgumentError # 2 < nil
         end
 
         begin
           begin
-            raise BAD_RANGE_ERROR_MSG % [@options[:count].to_s] if @options[:count] && @options[:count].is_a?(Range) && (@options[:count].min.nil? or @options[:count].min < 0)
+            raise MESSAGES[:bad_range_error] % [@options[:count].to_s] if @options[:count] && @options[:count].is_a?(Range) && (@options[:count].min.nil? or @options[:count].min < 0)
           rescue ArgumentError, "comparison of String with" # if @options[:count] == 'a'..'z'
-            raise BAD_RANGE_ERROR_MSG % [@options[:count].to_s]
+            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 BAD_RANGE_ERROR_MSG % [@options[:count].to_s]
+          raise MESSAGES[:bad_range_error] % [@options[:count].to_s]
         end
 
         @options[:minimum] ||= @options.delete(:min)
@@ -266,7 +273,7 @@ module RSpec
     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)
-      @__current_scope_for_nokogiri_matcher = NokogiriMatcher.new(tag, options, &block)
+      @__current_scope_for_nokogiri_matcher = HaveTag.new(tag, options, &block)
     end
 
     def with_text text
@@ -552,3 +559,11 @@ module RSpec
 
   end
 end
+
+if defined? Cucumber
+  World RSpec::HtmlMatchers
+else
+  RSpec.configure do |config|
+    config.include(RSpec::HtmlMatchers)
+  end
+end

data/spec/have_tag_spec.rb

@@ -264,7 +264,7 @@ describe 'have_tag' do
         expect(rendered).to have_tag('div', :count => 2, :max     => 1)
       }.to raise_error(wrong_params_error_msg_1)
 
-      wrong_params_error_msg_2 = ':minimum shold be less than :maximum!'
+      wrong_params_error_msg_2 = ':minimum should be less than :maximum!'
 
       expect {
         expect(rendered).to have_tag('div', :minimum => 2, :maximum => 1)

data/spec/spec_helper.rb

@@ -1,78 +1,13 @@
-require 'rspec/core'
-require 'rspec/expectations'
-
 if defined?(SimpleCov)
   SimpleCov.start do
     add_group 'Main', '/lib/'
+    add_filter "/spec/"
   end
 end
 
 require 'rspec-html-matchers'
 
-module AssetHelpers
-
-  ASSETS = File.expand_path('../fixtures/%s.html',__FILE__)
-
-  def asset name
-    asset_content = fixtures[name] ||= IO.read(ASSETS%name)
-    let(:rendered) { asset_content }
-  end
-
-  private
-
-  def fixtures
-    @assets ||= {}
-  end
-
-end
-
-RSpec::Matchers.define :raise_spec_error do |expected_exception_msg|
-  define_method :actual_msg do
-    @actual_msg
-  end
-
-  define_method :catched_exception do
-    @catched_exception
-  end
-
-  match do |block|
-    begin
-      block.call
-      false
-    rescue RSpec::Expectations::ExpectationNotMetError => rspec_error
-      @actual_msg = rspec_error.message
-
-      case expected_exception_msg
-      when String
-        actual_msg == expected_exception_msg
-      when Regexp
-        actual_msg =~ expected_exception_msg
-      end
-    rescue StandardError => e
-      @catched_exception = e
-      false
-    end
-  end
-
-  failure_message_for_should do |block|
-    if actual_msg
-<<MSG
-expected RSpec::Expectations::ExpectationNotMetError with message:
-#{expected_exception_msg}
-
-got:
-#{actual_msg}
-
-Diff:
-#{RSpec::Expectations::Differ.new.diff_as_string(actual_msg,expected_exception_msg.to_s)}
-MSG
-    elsif catched_exception
-      "expected RSpec::Expectations::ExpectationNotMetError, but was #{catched_exception.inspect}"
-    else
-      "expected RSpec::Expectations::ExpectationNotMetError, but was no exception"
-    end
-  end
-end
+Dir[File.expand_path("../../spec/support/**/*.rb",__FILE__)].each { |f| require f }
 
 RSpec.configure do |config|
 
@@ -80,9 +15,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
   config.filter_run_excluding wip: true
 
-  config.extend  AssetHelpers
+  config.extend AssetHelpers
 end

data/spec/support/asset_helpers.rb

@@ -0,0 +1,16 @@
+module AssetHelpers
+
+  ASSETS = File.expand_path('../../fixtures/%s.html',__FILE__)
+
+  def asset name
+    f = fixtures[name] ||= IO.read(ASSETS%name)
+    let(:rendered) { f }
+  end
+
+  private
+
+  def fixtures
+    @assets ||= {}
+  end
+
+end

data/spec/support/raise_spec_error_helper.rb

@@ -0,0 +1,49 @@
+RSpec::Matchers.define :raise_spec_error do |expected_exception_msg|
+  define_method :actual_msg do
+    @actual_msg
+  end
+
+  define_method :catched_exception do
+    @catched_exception
+  end
+
+  match do |block|
+    begin
+      block.call
+      false
+    rescue RSpec::Expectations::ExpectationNotMetError => rspec_error
+      @actual_msg = rspec_error.message
+
+      case expected_exception_msg
+      when String
+        actual_msg == expected_exception_msg
+      when Regexp
+        actual_msg =~ expected_exception_msg
+      end
+    rescue StandardError => e
+      @catched_exception = e
+      false
+    end
+  end
+
+  supports_block_expectations
+
+  failure_message do |block|
+    if actual_msg
+<<MSG
+expected RSpec::Expectations::ExpectationNotMetError with message:
+#{expected_exception_msg}
+
+got:
+#{actual_msg}
+
+Diff:
+#{RSpec::Expectations::Differ.new.diff_as_string(actual_msg,expected_exception_msg.to_s)}
+MSG
+    elsif catched_exception
+      "expected RSpec::Expectations::ExpectationNotMetError, but was #{catched_exception.inspect}"
+    else
+      "expected RSpec::Expectations::ExpectationNotMetError, but was no exception"
+    end
+  end
+end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +176,8 @@ files:
 - spec/form_matchers_spec.rb
 - spec/have_tag_spec.rb
 - spec/spec_helper.rb
+- spec/support/asset_helpers.rb
+- spec/support/raise_spec_error_helper.rb
 homepage: http://github.com/kucaahbe/rspec-html-matchers
 licenses:
 - MIT
@@ -211,16 +207,18 @@ signing_key:
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x
 test_files:
+- spec/support/asset_helpers.rb
+- spec/support/raise_spec_error_helper.rb
 - spec/spec_helper.rb
-- spec/fixtures/paragraphs.html
 - spec/fixtures/ordered_list.html
-- spec/fixtures/search_and_submit.html
-- spec/fixtures/single_element.html
+- spec/fixtures/paragraphs.html
 - spec/fixtures/quotes.html
-- spec/fixtures/form.html
 - spec/fixtures/special.html
+- spec/fixtures/search_and_submit.html
+- spec/fixtures/form.html
+- spec/fixtures/single_element.html
 - spec/have_tag_spec.rb
 - spec/form_matchers_spec.rb
-- features/step_definitions/steps.rb
-- features/js_generated_content.feature
 - features/support/env.rb
+- features/js_generated_content.feature
+- features/step_definitions/steps.rb