test-unit-capybara 1.0.2 → 1.0.3

data/Gemfile

@@ -18,14 +18,4 @@
 
 source :rubygems
 
-gem "test-unit", ">= 2.4.4"
-gem "capybara", ">= 1.1.2"
-gem "json"
-
-group :development, :test do
-  gem "rake"
-  gem "jeweler"
-  gem "yard"
-  gem "packnga"
-  gem "test-unit-notify"
-end
+gemspec

data/Rakefile

@@ -21,41 +21,18 @@ require './lib/test/unit/capybara/version'
 require 'rubygems'
 require 'rubygems/package_task'
 require 'yard'
-require 'jeweler'
 require 'packnga'
+require "bundler/gem_helper"
 
-def cleanup_white_space(entry)
-  entry.gsub(/(\A\n+|\n+\z)/, '') + "\n"
-end
+base_dir = File.dirname(__FILE__)
+helper = Bundler::GemHelper.new(base_dir)
 
-ENV["VERSION"] ||= Test::Unit::Capybara::VERSION
-version = ENV["VERSION"].dup
-spec = nil
-Jeweler::Tasks.new do |_spec|
-  spec = _spec
-  spec.name = "test-unit-capybara"
-  spec.version = version
-  spec.rubyforge_project = "test-unit"
-  spec.homepage = "http://test-unit.rubyforge.org/#test-unit-capybara"
-  spec.authors = ["Kouhei Sutou"]
-  spec.email = ["kou@clear-code.com"]
-  entries = File.read("README.textile").split(/^h2\.\s(.*)$/)
-  description = cleanup_white_space(entries[entries.index("Description") + 1])
-  spec.summary, spec.description, = description.split(/\n\n+/, 3)
-  spec.license = "LGPLv2 or later"
-  spec.files = FileList["lib/**/*.rb",
-                        "bin/*",
-                        "doc/text/*",
-                        "README.textile",
-                        "COPYING",
-                        "Rakefile",
-                        "Gemfile"]
-  spec.test_files = FileList["test/**/*.rb"]
+def helper.version_tag
+  version
 end
 
-Rake::Task["release"].prerequisites.clear
-Jeweler::RubygemsDotOrgTasks.new do
-end
+helper.install
+spec = helper.gemspec
 
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true

data/doc/text/news.textile

@@ -1,5 +1,15 @@
 h1. News
 
+h2(#1-0-3). 1.0.3 - 2012-11-29
+
+A support Capybara 2.0.1 release.
+
+h3. Improvments
+
+* Supported Capybara 2.0.1.
+  It requires Capybara >= 2.0.1 and test-unit >= 2.5.3.
+  Notice: Capybara 1.X aren't supported yet from this release.
+
 h2(#1-0-2). 1.0.2 - 2012-03-12
 
 A Capybara integration improvement release.

data/lib/test/unit/capybara.rb

@@ -53,7 +53,8 @@ module Test::Unit
 
     # @private
     class ElementNotFound < ::Capybara::ElementNotFound
-      attr_reader :node, :kind, :locator
+      attr_accessor :node
+      attr_reader :kind, :locator
       def initialize(node, kind, locator, message)
         @node = node
         @kind = kind
@@ -63,34 +64,48 @@ module Test::Unit
     end
 
     # @private
-    module FindError
+    module FindErrorWrapper
       class << self
         def included(base)
           base.module_eval do
-            alias_method :raise_find_error_original, :raise_find_error
-            alias_method :raise_find_error, :raise_find_error_for_test_unit
+            alias_method :find_error_original, :find_error
+            alias_method :find_error, :find_error_for_test_unit
           end
         end
       end
 
-      def raise_find_error_for_test_unit(*args)
-        options = extract_normalized_options(args)
-        normalized = ::Capybara::Selector.normalize(*args)
-        if normalized.failure_message
-          message = normalized.failure_message.call(self, normalized)
-        else
-          message = options[:message]
-          message ||= ("Unable to find #{normalized.name} " +
-                       "#{normalized.locator.inspect}")
+      def find_error_for_test_unit(*args)
+        error = find_error_original(*args)
+        if error.is_a?(::Capybara::ElementNotFound)
+          error = ElementNotFound.new(nil,
+                                      @query.selector.name,
+                                      @query.locator,
+                                      error.message)
+        end
+        error
+      end
+    end
+
+    # @private
+    module FindErrorNodeSetter
+      def find(*args)
+        begin
+          super
+        rescue ElementNotFound => error
+          error.node = self
+          raise error
         end
-        raise ElementNotFound.new(self, normalized.selector.name,
-                                  normalized.locator, message)
       end
     end
 
     # @private
-    class ::Capybara::Node::Base
-      include FindError
+    class ::Capybara::Result
+      include FindErrorWrapper
+    end
+
+    # @private
+    class ::Capybara::Node::Element
+      include FindErrorNodeSetter
     end
 
     # @private
@@ -477,6 +492,8 @@ EOT
         if node
           if node.base.respond_to?(:source)
             node.base.source
+          elsif node.base.respond_to?(:html)
+            node.base.html
           else
             node.base.native.to_s
           end

data/lib/test/unit/capybara/version.rb

@@ -19,7 +19,7 @@
 module Test
   module Unit
     module Capybara
-      VERSION = "1.0.2"
+      VERSION = "1.0.3"
     end
   end
 end

data/test/test-wrapper.rb

@@ -73,6 +73,9 @@ HTML
 
   def test_find
     result = _run_test
+    assert_equal("1 tests, 1 assertions, 1 failures, 0 errors, 0 pendings, " \
+                 "0 omissions, 0 notifications", result.to_s)
+
     message = <<-EOM.chomp
 <"h3">(:css) expected to find a element in
 <<div class="section">
@@ -81,8 +84,6 @@ HTML
 EOM
     assert_equal([message],
                  result.failures.collect {|failure| failure.message})
-    assert_equal("1 tests, 1 assertions, 1 failures, 0 errors, 0 pendings, " \
-                 "0 omissions, 0 notifications", result.to_s)
   end
 
   private

metadata

@@ -1,194 +1,213 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: test-unit-capybara
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 4
-        - 4
-        version: 2.4.4
+date: 2012-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test-unit
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.3
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  name: capybara
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.3
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: json
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yard
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: packnga
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: packnga
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: test-unit-notify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
-description: ""
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
+email:
 - kou@clear-code.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- lib/test/unit/capybara/version.rb
+- lib/test/unit/capybara.rb
+- doc/text/news.textile
 - README.textile
-files: 
 - COPYING
-- Gemfile
-- README.textile
 - Rakefile
-- doc/text/news.textile
-- lib/test/unit/capybara.rb
-- lib/test/unit/capybara/version.rb
+- Gemfile
 - test/run-test.rb
 - test/test-assertions.rb
-- test/test-unit-capybara-test-utils.rb
 - test/test-wrapper.rb
+- test/test-unit-capybara-test-utils.rb
 homepage: http://test-unit.rubyforge.org/#test-unit-capybara
-licenses: 
+licenses:
 - LGPLv2 or later
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 920619814670605304
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 920619814670605304
 requirements: []
-
 rubyforge_project: test-unit
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: test-unit-capybara is a Capybara adapter for test-unit 2. You can get "Capybara":https://rubygems.org/gems/capybara integrated Test::Unit::TestCase. It also provides useful assertions for Capybara.
-test_files: 
+summary: test-unit-capybara is a Capybara adapter for test-unit 2. You can get "Capybara":https://rubygems.org/gems/capybara
+  integrated Test::Unit::TestCase. It also provides useful assertions for Capybara.
+test_files:
 - test/run-test.rb
 - test/test-assertions.rb
-- test/test-unit-capybara-test-utils.rb
 - test/test-wrapper.rb
+- test/test-unit-capybara-test-utils.rb
+has_rdoc: