rspec-html-matchers 0.3.4 → 0.3.5

data/.gitignore

@@ -2,7 +2,10 @@ pkg/*
 *.gem
 .bundle
 .rvmrc
+.rbenv-*
 Gemfile.lock
+# logs
+chromedriver.log
 # documentation:
 html
 doc

data/CHANGELOG.md

@@ -7,6 +7,11 @@ unreleased(TODO)
 * improve documentation(look at changelog and code!)
 * add :without to have\_tag? like have_tag('div', :without => { :class => 'test' })
 
+0.3.5
+-----
+
+* Fix for content matching regexps with single and double quotes (#14 thanks to watsonbox)
+
 0.3.4
 -----
 

data/README.md

@@ -141,6 +141,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]
 
 MIT Licensed
 ============

data/features/support/env.rb

@@ -9,6 +9,11 @@ class SimpleApp < Sinatra::Base
   set :public_folder, $ASSETS_DIR
 end
 
+unless ENV.has_key? 'TRAVIS'
+  Capybara.register_driver :selenium do |app|
+    Capybara::Selenium::Driver.new(app, :browser => (ENV['BROWSER'] || :chrome))
+  end
+end
 Capybara.default_driver = :selenium
 Capybara.app = SimpleApp
 

data/lib/rspec-html-matchers.rb

@@ -121,11 +121,15 @@ module RSpec
 
         case text=@options[:text]
         when Regexp
-          new_scope = @current_scope.css(":regexp('#{text}')",Class.new {
-            def regexp node_set, text
-              node_set.find_all { |node| node.content =~ Regexp.new(text) }
+          new_scope = @current_scope.css(":regexp()",Class.new {
+            def initialize(regex)
+              @regex = regex
             end
-          }.new)
+
+            def regexp node_set
+              node_set.find_all { |node| node.content =~ @regex }
+            end
+          }.new(text))
           unless new_scope.empty?
             @count = new_scope.count
             @negative_failure_message = REGEXP_FOUND_MSG % [text.inspect,@tag,@document]

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.3.4'
+  s.version     = '0.3.5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kucaahbe"]
   s.email       = ["kucaahbe@ukr.net"]

data/spec/matchers/have_tag_spec.rb

@@ -211,6 +211,7 @@ describe 'have_tag' do
       rendered.should have_tag('div',  :text => /SAMPLE/i)
       rendered.should have_tag('span', :text => "sample with 'single' quotes")
       rendered.should have_tag('span', :text => %Q{sample with 'single' and "double" quotes})
+      rendered.should have_tag('span', :text => /sample with 'single' and "double" quotes/)
 
       rendered.should have_tag('p',    :text => 'content with ignored spaces around')
       rendered.should have_tag('p',    :text => 'content with ignored spaces in')
@@ -267,7 +268,6 @@ describe 'have_tag' do
         %Q{/SAMPLE text/i regexp unexpected within "div" in following template:\n#{rendered}\nbut was found.}
       )
     end
-
   end
 
   context "mixed matching" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -148,14 +148,12 @@ files:
 - assets/search_and_submit.html
 - assets/special.html
 - cucumber.yml
-- features/ajax_generated_content.feature
+- features/js_generated_content.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - lib/rspec-html-matchers.rb
 - mikhalok.jpg
 - rspec-html-matchers.gemspec
-- script/assets.rb
-- script/console
 - spec/matchers/form_matchers_spec.rb
 - spec/matchers/have_tag_spec.rb
 - spec/spec_helper.rb
@@ -180,8 +178,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec-html-matchers
-rubygems_version: 1.8.18
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x
-test_files: []
+test_files:
+- features/js_generated_content.feature
+- features/step_definitions/steps.rb
+- features/support/env.rb
+- spec/matchers/form_matchers_spec.rb
+- spec/matchers/have_tag_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers.rb

data/script/assets.rb

@@ -1,38 +0,0 @@
-class Asset
-  @@assets = {}
-
-  PATH = File.expand_path(File.join(File.dirname(__FILE__),'..','assets','*.html'))
-
-  def self.[] name
-    @@assets[name.to_s]
-  end
-
-  def self.<< asset
-    @@assets.merge! asset.name => asset
-  end
-
-  def self.list
-    @@assets.keys
-  end
-
-  attr_reader :name
-
-  def initialize name, path
-    @name = name
-    @path = path
-  end
-
-  def content
-    @content ||= IO.read(@path)
-    puts @content
-    return @content
-  end
-  alias_method :c, :content
-end
-
-puts 'assets list:'
-Dir[Asset::PATH].each do |asset_path|
-  asset_name = File.basename(asset_path,'.html')
-  puts asset_name
-  Asset << Asset.new(asset_name,asset_path)
-end

data/script/console

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler/setup'
-require 'nokogiri'
-require File.join(File.dirname(__FILE__),'assets.rb')
-require 'irb'
-
-IRB.start