rspec-html-matchers 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c40089154ba9a7a570f4991d6d54bbb58725a3
-  data.tar.gz: 4246eccfcc5ec3f701714dc0be5d0ffb5305f0b2
+  metadata.gz: c6328e772ffb7996623cb71c27d5769a2a321023
+  data.tar.gz: 0471f0b792afa788a578b429b76168a28892dd1d
 SHA512:
-  metadata.gz: d43888afd5230a76c22b77a5be9a1c5073b95a329455700110ce80640a9e84f3b7555c1aefbe1f1d9223b6fd6493c9dad07693e905de81503a8664eeb5615986
-  data.tar.gz: bb39df942cb75d2af535de0509a1b603d1b2885a2a7dd1f1c4fe887387f133994994c0acb01dc403ee319b6158bee5c5bb6f667496bc2f5fe791f2c76a149af6
+  metadata.gz: 671556c67549c13a77754f096fa180508d68a073c87bba231322cef2962664b7af8aa30c0a85662164bb8507bd278618a7bcacabf7b379f534953547ec852e14
+  data.tar.gz: 686ddbb59fa4ea2fc203c7990bdb1e99e813e06f771b8e3da44e6058e44c01e9c0c7b84fb46df30c5319f03e4d7456857e01841d8072c6ad418208ad64680f27

data/.travis.yml

@@ -1,9 +1,9 @@
+language: ruby
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 rvm:
-  - ree
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  #- jruby-19mode
+  - rbx-19mode

data/CHANGELOG.md

@@ -4,18 +4,22 @@ Changelog
 unreleased(TODO)
 ----------------
 
-* add :without to have\_tag? like have_tag('div', :without => { :class => 'test' })
 * with_tag should raise error when used outside have_tag
 * add ability to have_form('/url', 'PUT') or have_form('/url', :PUT)
 * inteligent 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
 
-0.5.0(TODO)
------------
+0.5.0
+-----
 
-* order matching
 * improve documentation, add more usage examples (look at changelog and code!)
 
+0.4.2
+-----
+
+* added :without to have\_tag? like have_tag('div', :without => { :class => 'test' }) NOTE: currently only classes supported
+
 0.4.1
 -----
 

data/README.md

@@ -95,6 +95,16 @@ Input could be any html string. Let's take a look at these examples:
   '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => ['qwe', 'rty'] })
   ```
 
+  The same works with `:without`:
+
+  ```ruby
+  # all of this are equivalent:
+  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => 'qwe rty' })
+  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => 'rty qwe' })
+  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => ['rty', 'qwe'] })
+  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => ['qwe', 'rty'] })
+  ```
+
 * content matching:
 
   ```ruby
@@ -172,7 +182,7 @@ Contributors
 - [Simon Schoeters](https://github.com/cimm)
 - [Felix Tjandrawibawa](https://github.com/cemenghttps://github.com/cemeng)
 - [Szymon Przybył](https://github.com/apocalyptiq)
-- [Howard Wilson](https://github.com/watsonbox)
+- [Manuel Meurer](https://github.com/manuelmeurer)
 
 MIT Licensed
 ============

data/features/support/env.rb

@@ -2,7 +2,7 @@ require 'sinatra/base'
 require 'capybara/cucumber'
 require 'rspec-html-matchers'
 
-$ASSETS_DIR = File.expand_path('../../../spec/assets',__FILE__)
+$ASSETS_DIR = File.expand_path('../tmp',__FILE__)
 $INDEX_HTML = File.join($ASSETS_DIR,'index.html')
 
 class SimpleApp < Sinatra::Base
@@ -17,6 +17,10 @@ end
 Capybara.default_driver = :selenium
 Capybara.app = SimpleApp
 
+Before do
+  FileUtils.mkdir $ASSETS_DIR
+end
+
 After do
-  FileUtils.rm $INDEX_HTML
+  FileUtils.rm_rf $ASSETS_DIR
 end

data/lib/rspec-html-matchers.rb

@@ -71,19 +71,21 @@ module RSpec
       def initialize tag, options={}, &block
         @tag, @options, @block = tag.to_s, options, block
 
-        if attrs = @options.delete(:with)
-          if classes=attrs.delete(:class)
-            classes = case classes
-                      when Array
-                        classes.join('.')
-                      when String
-                        classes.gsub("\s",'.')
-                      end
-            @tag << '.'+classes
+        if with_attrs = @options.delete(:with)
+          if classes = with_attrs.delete(:class)
+            @tag << '.' + classes_to_selector(classes)
+          end
+          selector = with_attrs.inject('') do |html_attrs_string, (k, v)|
+            html_attrs_string << "[#{k}='#{v}']"
+            html_attrs_string
+          end
+          @tag << selector
+        end
+
+        if without_attrs = @options.delete(:without)
+          if classes = without_attrs.delete(:class)
+            @tag << ":not(.#{classes_to_selector(classes)})"
           end
-          html_attrs_string=''
-          attrs.each_pair { |k,v| html_attrs_string << %Q{[#{k.to_s}='#{v.to_s}']} }
-          @tag << html_attrs_string
         end
 
         validate_options!
@@ -124,6 +126,15 @@ module RSpec
 
       private
 
+      def classes_to_selector(classes)
+        case classes
+        when Array
+          classes.join('.')
+        when String
+          classes.gsub(/\s+/, '.')
+        end
+      end
+
       def tag_presents?
         if @current_scope.first
           @count = @current_scope.count
@@ -380,6 +391,7 @@ module RSpec
       should_not_have_input(options)
     end
 
+    # TODO add ability to explicitly say that value should be empty
     def with_password_field name, value=nil
       options = form_tag_options('password',name,value)
       should_have_input(options)

data/rspec-html-matchers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'rspec-html-matchers'
-  s.version     = '0.4.1'
+  s.version     = '0.4.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['kucaahbe']
   s.email       = ['kucaahbe@ukr.net']
@@ -26,7 +26,9 @@ DESC
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'capybara'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 2.11.0' # in order to use new expect().to syntax
+  s.add_development_dependency 'travis-lint'
 end

data/spec/fixtures/single_element.html

@@ -0,0 +1 @@
+<div class="foo bar"></div>

data/spec/matchers/have_tag_spec.rb

@@ -98,6 +98,22 @@ describe 'have_tag' do
 
     end
 
+    context "with additional HTML attributes (:without option)" do
+      asset 'single_element'
+
+      it "should find tags that have classes specified via array (or string)" do
+        rendered.should_not have_tag('div', :without => { :class => %w(foo bar) })
+        rendered.should_not have_tag('div', :without => { :class => 'foo bar' })
+        rendered.should_not have_tag('div', :without => { :class => 'foo' })
+        rendered.should_not have_tag('div', :without => { :class => 'bar' })
+      end
+
+      it "should not find tags that have classes specified via array (or string)" do
+        rendered.should have_tag('div', :without => { :class => %w(foo baz) })
+        rendered.should have_tag('div', :without => { :class => 'foo baz' })
+        rendered.should have_tag('div', :without => { :class => 'baz' })
+      end
+    end
   end
 
   context "by count" do
@@ -224,7 +240,7 @@ describe 'have_tag' do
       end
 
       it "should find with unicode text specified" do
-        expect { rendered.should have_tag('a', :text => "học") }.to_not raise_exception(Encoding::CompatibilityError) if RUBY_VERSION =~ /^1\.9/
+        expect { rendered.should have_tag('a', :text => "học") }.not_to raise_error
           rendered.should have_tag('a', :text => "học")
       end
 

data/spec/spec_helper.rb

@@ -8,14 +8,19 @@ end
 
 require 'rspec-html-matchers'
 
-SPEC_DIR = File.dirname(__FILE__)
-
 module AssetHelpers
 
+  ASSETS = File.expand_path('../fixtures/%s.html',__FILE__)
+
   def asset name
-    let :rendered do
-      IO.read File.join(SPEC_DIR,"assets/#{name}.html")
-    end
+    asset_content = fixtures[name] ||= IO.read(ASSETS%name)
+    let(:rendered) { asset_content }
+  end
+
+  private
+
+  def fixtures
+    @assets ||= {}
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: travis-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x. Does not depend on assert_select matcher, provides useful error messages.
 email:
@@ -144,12 +172,13 @@ files:
 - features/support/env.rb
 - lib/rspec-html-matchers.rb
 - rspec-html-matchers.gemspec
-- spec/assets/form.html
-- spec/assets/ordered_list.html
-- spec/assets/paragraphs.html
-- spec/assets/quotes.html
-- spec/assets/search_and_submit.html
-- spec/assets/special.html
+- spec/fixtures/form.html
+- spec/fixtures/ordered_list.html
+- spec/fixtures/paragraphs.html
+- spec/fixtures/quotes.html
+- spec/fixtures/search_and_submit.html
+- spec/fixtures/single_element.html
+- spec/fixtures/special.html
 - spec/matchers/form_matchers_spec.rb
 - spec/matchers/have_tag_spec.rb
 - spec/spec_helper.rb
@@ -172,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec-html-matchers
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x