test-unit-capybara 1.0.3 → 1.0.4

data/doc/text/news.textile

@@ -1,5 +1,20 @@
 h1. News
 
+h2(#1-0-4). 1.0.4 - 2013-05-15
+
+A Capybara 2.1.0 support release.
+
+h3. Improvments
+
+* Supported Capybara 2.1.0.
+  It requires Capybara >= 2.1.0.
+  Notice: Capybara < 2.1.0 aren't supported from this release.
+  [GitHub#2] [Reported by thelastinuit]
+
+h3. Thanks
+
+* thelastinuit
+
 h2(#1-0-3). 1.0.3 - 2012-11-29
 
 A support Capybara 2.0.1 release.

data/lib/test/unit/capybara.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -65,49 +65,25 @@ module Test::Unit
 
     # @private
     module FindErrorWrapper
-      class << self
-        def included(base)
-          base.module_eval do
-            alias_method :find_error_original, :find_error
-            alias_method :find_error, :find_error_for_test_unit
-          end
-        end
-      end
-
-      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
+        rescue ::Capybara::ElementNotFound => error
+          query = ::Capybara::Query.new(*args)
+          new_error = ElementNotFound.new(self,
+                                          query.selector.name,
+                                          query.locator,
+                                          error.message)
+          raise new_error
         end
       end
     end
 
     # @private
-    class ::Capybara::Result
+    class ::Capybara::Node::Base
       include FindErrorWrapper
     end
 
-    # @private
-    class ::Capybara::Node::Element
-      include FindErrorNodeSetter
-    end
-
     # @private
     module ElementNotFoundHandler
       class << self
@@ -227,7 +203,7 @@ module Test::Unit
         if block_given?
           expected_response, actual_response = yield(expected_response,
                                                      actual_response)
-	end
+        end
         assert_equal(expected_response, actual_response)
       end
 
@@ -300,7 +276,7 @@ module Test::Unit
 <?>(?) expected to find one or more elements in
 <?>
 EOT
-        current_context = node || page.send(:current_node)
+        current_context = node || page.send(:current_scope)
         current_context_source = node_source(current_context)
         source_in_message = AssertionMessage.literal(current_context_source)
         full_message = build_message(args[:message],
@@ -405,7 +381,7 @@ EOT
 EOT
         element_source = nil
         element_source = node_source(element) if element
-        current_context = node || page.send(:current_node)
+        current_context = node || page.send(:current_scope)
         current_context_source = node_source(current_context)
         source_in_message = AssertionMessage.literal(current_context_source)
         full_message = build_message(args[:message],

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

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
 module Test
   module Unit
     module Capybara
-      VERSION = "1.0.3"
+      VERSION = "1.0.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit-capybara
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -162,17 +162,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/test/unit/capybara/version.rb
 - lib/test/unit/capybara.rb
+- lib/test/unit/capybara/version.rb
 - doc/text/news.textile
 - README.textile
 - COPYING
 - Rakefile
 - Gemfile
+- test/test-unit-capybara-test-utils.rb
 - test/run-test.rb
 - test/test-assertions.rb
 - test/test-wrapper.rb
-- test/test-unit-capybara-test-utils.rb
 homepage: http://test-unit.rubyforge.org/#test-unit-capybara
 licenses:
 - LGPLv2 or later
@@ -186,18 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 920619814670605304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 920619814670605304
 requirements: []
 rubyforge_project: test-unit
 rubygems_version: 1.8.23
@@ -206,8 +200,8 @@ 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:
+- test/test-unit-capybara-test-utils.rb
 - test/run-test.rb
 - test/test-assertions.rb
 - test/test-wrapper.rb
-- test/test-unit-capybara-test-utils.rb
 has_rdoc: