rspec-html-matchers 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8694153cec5f8ee172a384595fa0011ff7f7db1b
-  data.tar.gz: 4f23a0514a57c5af870b589f8cd91c0905a01889
+  metadata.gz: 95d16513be1c4d695f1c2dec1c2e43bcece4c97f
+  data.tar.gz: 523b06ab97e4993f5f79334447483c9121cadb7c
 SHA512:
-  metadata.gz: 611f3063dadc57bf218d88a8782559e1a3121405de1cf5b99659f60840a51843926c9d2df2ae7c304730421a08b398dde5398096cd8ba5ee3a135c7dc6fa8e9e
-  data.tar.gz: a16c21bb9aa3784b7d949d8826d7d9b483800052738dd4224c89f70f1c434935e2eb1be0295553a951ff50e88b217333cd8f73ff382b3705656948f7904cf5a0
+  metadata.gz: 5e49505a8a621e4d7c660827f5450efb92e5d320effadbc93d26a9391ee5a689710d45d4ef78b6339fdf374448820c2a5720a3a71b35c75f9167b67152671253
+  data.tar.gz: f7dbee862ebefebb529b1f99ad3c79e867ebe5535c8d1d3e79a21f9fc8c0e105cfbf2f4f6b5c5bf35350f715fae351e24b86b9bab986ee5a4cd07a6ca04bf6ba

data/CHANGELOG.md

@@ -11,6 +11,11 @@ unreleased(TODO)
 * order matching
 * improve documentation, add more usage examples (look at changelog and code!)
 
+0.8.0
+-----
+
+* "seen" text matching (thanks to [Alex Shi](https://github.com/hlcfan))
+
 0.7.3
 -----
 

data/README.md

@@ -13,11 +13,11 @@ Goals
   * [assert_select](http://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)
-* developer-firendly output in error messages
+* developer-friendly output in error messages
 * built on top of [nokogiri](http://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)
+* 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)
 
 Install
 -------
@@ -28,7 +28,7 @@ Add to your Gemfile in the `:test` group:
 gem 'rspec-html-matchers'
 ```
 
-and somewhere in RSpec configuration:
+Include it in your RSpec configuration:
 
 ```ruby
 RSpec.configure do |config|
@@ -36,7 +36,7 @@ RSpec.configure do |config|
 end
 ```
 
-or just in you spec(s):
+or just in your spec(s):
 
 ```ruby
 describe "my view spec" do
@@ -55,12 +55,12 @@ Cucumber configuration:
 World RSpecHtmlMatchers
 ```
 
-as this gem requires **nokogiri**, here [instructions for installing it](http://nokogiri.org/tutorials/installing_nokogiri.html).
+as this gem requires **nokogiri**, here are [instructions for installing it](http://nokogiri.org/tutorials/installing_nokogiri.html).
 
 Usage
 -----
 
-so perharps your code produces following output:
+so perhaps your code produces following output:
 
 ```html
 <h1>Simple Form</h1>
@@ -74,7 +74,7 @@ so perharps your code produces following output:
 </form>
 ```
 
-so you test it with following:
+so you test it with the following:
 
 ```ruby
 expect(rendered).to have_tag('form', :with => { :action => '/users', :method => 'post' }) do
@@ -85,9 +85,9 @@ expect(rendered).to have_tag('form', :with => { :action => '/users', :method =>
 end
 ```
 
-Example about should be self-descriptive, if not, please refer to [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`](http://www.rubydoc.info/gems/rspec-html-matchers/RSpecHtmlMatchers%3Ahave_tag) documentation
 
-Input could be any html string. Let's take a look at these examples:
+Input can be any html string. Let's take a look at these examples:
 
 * matching tags by css:
 
@@ -154,6 +154,14 @@ Input could be any html string. Let's take a look at these examples:
   expect('<p> Some content&nbsphere</p>').to have_tag('p') do
     with_content mymock.text
   end
+
+  # matching text content as it's seen by user:
+  rendered = <<HTML
+  <p>
+     content with ignored spaces around
+  </p>
+  HTML
+  expect(rendered).to have_tag('p', :seen => 'content with ignored spaces around')
   ```
 
 * usage with capybara and cucumber:
@@ -198,6 +206,15 @@ expect(response).to have_tag('div', /regexp matching expected content/)
 
 [RSpec 1 `have_tag` documentation](http://old.rspec.info/rails/writing/views.html)
 
+Matching Tag Attributes
+-----------------------
+
+You can also match the content of attributes by using selectors. For example, to ensure an `img` tag has an `alt` attribute, you can match:
+
+```ruby
+expect(index).to have_tag("img[alt!='']")
+```
+
 More info
 ---------
 

data/lib/rspec-html-matchers.rb

@@ -23,13 +23,15 @@ module RSpecHtmlMatchers
   class NokogiriTextHelper
     NON_BREAKING_SPACE = "\u00a0"
 
-    def initialize text
+    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
@@ -96,6 +98,7 @@ module RSpecHtmlMatchers
       end
 
       validate_options!
+      set_options
     end
 
     def matches? document, &block
@@ -191,7 +194,7 @@ module RSpecHtmlMatchers
           false
         end
       else
-        new_scope = @current_scope.css(':content()',NokogiriTextHelper.new(text))
+        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]
@@ -206,32 +209,54 @@ module RSpecHtmlMatchers
     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 @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 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

data/spec/have_tag_spec.rb

@@ -278,7 +278,7 @@ describe 'have_tag' do
     end
   end
 
-  context "with :text specified" do
+  context "with :text/:seen specified" do
     asset 'quotes'
 
     context 'using standard syntax' do
@@ -291,6 +291,10 @@ describe 'have_tag' do
         expect(rendered).to have_tag('span', :text => %Q{sample with 'single' and "double" quotes})
         expect(rendered).to have_tag('span', :text => /sample with 'single' and "double" quotes/)
 
+        expect(rendered).to have_tag('p',    :seen => 'content with ignored spaces around')
+        expect(rendered).to have_tag('p',    :seen => 'content with ignored spaces in')
+        expect(rendered).to have_tag('p',    :seen => 'content with nbsp  and  spaces   around')
+
         expect(rendered).to have_tag('p',    :text => 'content with nbsp')
         expect(rendered).to have_tag('pre',  :text => " 1. bla   \n 2. bla ")
       end
@@ -308,8 +312,14 @@ describe 'have_tag' do
         expect(rendered).to_not have_tag('strong', :text => 'text does not present')
         expect(rendered).to_not have_tag('p',      :text => /text does not present/)
         expect(rendered).to_not have_tag('strong', :text => /text does not present/)
-
         expect(rendered).to_not have_tag('p',      :text => 'contentwith nbsp')
+
+        expect(rendered).to_not have_tag('p',      :seen => 'content with ignoredspaces around')
+        expect(rendered).to_not have_tag('p',      :seen => 'content with ignored  spaces around')
+        expect(rendered).to_not have_tag('p',      :seen => 'content withignored spaces in')
+        expect(rendered).to_not have_tag('p',      :seen => 'contentwith nbsp')
+        expect(rendered).to_not have_tag('p',      :seen => 'content with nbsp  and  spaces  around')
+
         expect(rendered).to_not have_tag('pre',    :text => "1. bla\n2. bla")
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec