rspec-html-matchers 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8141daf5621058a14ef8ec698529949abd8cdd0
-  data.tar.gz: 73123b9872a94964bdf13fdee043c91c7f98d93a
+  metadata.gz: ae62c873742a46c8fb8cc012dcdd382742d3c814
+  data.tar.gz: 826dbb0dd8359796f7820b8d22823459e5d6dc1d
 SHA512:
-  metadata.gz: c98a9b77eb1624c30c7c34796b1bd83c3d5d51418258e610f21df891d0a341bc1960f206510742023fb97fffe3bdbc7df878b2792a3062229f386f6b4183d9ed
-  data.tar.gz: 54efdf3953862e14c44fafcfd64d2d8fc5bd90d9b6b965b9622409cfb195e7d288a9b4a21a6136108e7acd9fc2f50a071d8d5958536f6adf6a2a0bde2b4dbfa2
+  metadata.gz: 21f872d52bbff456fc1ea07ede21f715832a65fc91eba3810697b23dece8747e8388a7901b93cd6d80efe2b0db34c34fe9a8059f63441d521c4fab01af1df751
+  data.tar.gz: 0e689393aacbf4db06ffdcfb1069f739c85571a3c42d01619c7591972817a06b918ce464160613434f93bed47b5495aa5b74c8ff8c10f755e5d90d3d2909a63d

data/.travis.yml

@@ -5,5 +5,9 @@ before_script:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   #- jruby-19mode
-  - rbx-19mode
+  #- rbx-2.2.2
+branches:
+  only:
+    - master

data/README.md

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

data/lib/rspec-html-matchers.rb

@@ -94,7 +94,7 @@ module RSpec
       def matches? document, &block
         @block = block if block
 
-        document = document.html if defined?(Capybara) && document.is_a?(Capybara::Session)
+        document = document.html if defined?(Capybara::Session) && document.is_a?(Capybara::Session)
 
         case document
         when String
@@ -259,7 +259,7 @@ module RSpec
     #   '<div class="one two">'.should have_tag('div', :with => { :class => 'two one' })
     def have_tag tag, options={}, &block
       # for backwards compatibility with rpecs have tag:
-      options = { :text => options } if options.kind_of? String
+      options = { :text => options } if options.kind_of?(String) || options.kind_of?(Regexp)
       @__current_scope_for_nokogiri_matcher = NokogiriMatcher.new(tag, options, &block)
     end
 

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.3'
+  s.version     = '0.4.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['kucaahbe']
   s.email       = ['kucaahbe@ukr.net']
@@ -21,8 +21,8 @@ DESC
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rspec', '>= 2.0.0'
-  s.add_dependency 'nokogiri', '>= 1.4.4'
+  s.add_runtime_dependency 'rspec',    '~> 2', '>= 2.11.0'
+  s.add_runtime_dependency 'nokogiri', '~> 1'
 
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'cucumber'
@@ -30,6 +30,5 @@ DESC
   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/matchers/have_tag_spec.rb

@@ -235,10 +235,6 @@ describe 'have_tag' do
         rendered.should have_tag('pre',  :text => " 1. bla   \n 2. bla ")
       end
 
-      it "should map a string argument to :text => string" do
-        rendered.should have_tag('div',  'sample text')
-      end
-
       it "should find with unicode text specified" do
         expect { rendered.should have_tag('a', :text => "học") }.not_to raise_error
           rendered.should have_tag('a', :text => "học")
@@ -501,4 +497,28 @@ describe 'have_tag' do
       }.to raise_spec_error(/\/SAMPLE text\/i regexp expected within "li" in following template:\n#{ordered_list_regexp}/)
     end
   end
+
+  context "backwards compatibility for unnamed arguments" do
+    asset 'quotes'
+
+    context "string as second argument" do
+
+      it "should map a string argument to :text => string" do
+        rendered.should have_tag('div',  'sample text')
+      end
+
+    end
+
+    context "Regexp as second argument" do
+
+      it "should match against a valid Regexp" do
+        rendered.should have_tag('div',  /sample\s/)
+      end
+
+      it "should not match against an invalid Regexp" do
+        rendered.should_not have_tag('div',  /not matching/)
+      end
+    end
+  end
+
 end

metadata

@@ -1,153 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - kucaahbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: cucumber
   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: capybara
   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: 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
     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: rake
   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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !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: |
@@ -158,10 +150,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -192,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rspec-html-matchers
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x