test-unit-capybara 1.0.1 → 1.0.2

data/Gemfile

@@ -16,8 +16,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+source :rubygems
+
 gem "test-unit", ">= 2.4.4"
-gem "capybara", ">= 1.1.3"
+gem "capybara", ">= 1.1.2"
 gem "json"
 
 group :development, :test do

data/Rakefile

@@ -83,4 +83,11 @@ task :tag do
   sh 'git', 'tag', '-a', version, '-m', message
 end
 
+desc "Run test"
+task :test do
+  ruby "test/run-test.rb"
+end
+
+task :default => :test
+
 # vim: syntax=Ruby

data/doc/text/news.textile

@@ -1,5 +1,13 @@
 h1. News
 
+h2(#1-0-2). 1.0.2 - 2012-03-12
+
+A Capybara integration improvement release.
+
+h3. Improvments
+
+  * Supported Capybara 1.1.2 again.
+
 h2(#1-0-1). 1.0.1 - 2012-01-16
 
 A Capybara integration improvement release.

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

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

data/lib/test/unit/capybara.rb

@@ -53,11 +53,12 @@ module Test::Unit
 
     # @private
     class ElementNotFound < ::Capybara::ElementNotFound
-      attr_reader :node, :query
-      def initialize(node, query)
+      attr_reader :node, :kind, :locator
+      def initialize(node, kind, locator, message)
         @node = node
-        @query = query
-        super(@query.failure_message(:find, @node))
+        @kind = kind
+        @locator = locator
+        super(message)
       end
     end
 
@@ -73,8 +74,17 @@ module Test::Unit
       end
 
       def raise_find_error_for_test_unit(*args)
-        query = ::Capybara::Query.new(*args)
-        raise ElementNotFound.new(self, query)
+        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}")
+        end
+        raise ElementNotFound.new(self, normalized.selector.name,
+                                  normalized.locator, message)
       end
     end
 
@@ -95,11 +105,10 @@ module Test::Unit
       def handle_capybara_element_not_found(exception)
         return false unless exception.is_a?(ElementNotFound)
         return false unless respond_to?(:flunk_find)
-        query = exception.query
         begin
           flunk_find(exception.node,
-                     :kind => query.selector.name,
-                     :locator => query.locator)
+                     :kind => exception.kind,
+                     :locator => exception.locator)
         rescue AssertionFailedError => assertion_failed_error
           assertion_failed_error.backtrace.replace(exception.backtrace)
           handle_exception(assertion_failed_error)
@@ -345,7 +354,7 @@ EOT
       #     #       </div>
       #     #     </body>
       #     #   </html>
-      #     section = assert_find("section")
+      #     section = find("section")
       #     p section
       #       # => #<Capybara::Element tag="h2" path="/html/body/div">
       #     assert_not_find(section, "h1")
@@ -361,7 +370,7 @@ EOT
       #     #       </div>
       #     #     </body>
       #     #   </html>
-      #     section = assert_find("section")
+      #     section = find("section")
       #     p section
       #       # => #<Capybara::Element tag="h2" path="/html/body/div">
       #     assert_not_find(section, "h2")

metadata

@@ -1,112 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: test-unit-capybara
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: &10499920 !ruby/object:Gem::Requirement
+
+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
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 4
+        - 4
         version: 2.4.4
-  type: :runtime
+  name: test-unit
   prerelease: false
-  version_requirements: *10499920
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &10498860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.3
   type: :runtime
-  prerelease: false
-  version_requirements: *10498860
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &10497900 !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  name: capybara
   prerelease: false
-  version_requirements: *10497900
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &10497320 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: json
   prerelease: false
-  version_requirements: *10497320
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &10496560 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
   prerelease: false
-  version_requirements: *10496560
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &10495920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *10495920
-- !ruby/object:Gem::Dependency
-  name: packnga
-  requirement: &10495100 !ruby/object:Gem::Requirement
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  prerelease: false
   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: *10495100
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  requirement: &10494320 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: packnga
+  prerelease: false
   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"
+  name: test-unit-notify
   prerelease: false
-  version_requirements: *10494320
-description: ''
-email:
+  type: :development
+  requirement: *id008
+description: ""
+email: 
 - kou@clear-code.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
-files:
+files: 
 - COPYING
 - Gemfile
 - README.textile
@@ -114,38 +150,45 @@ files:
 - doc/text/news.textile
 - lib/test/unit/capybara.rb
 - lib/test/unit/capybara/version.rb
-- test/test-unit-capybara-test-utils.rb
 - test/run-test.rb
 - test/test-assertions.rb
+- test/test-unit-capybara-test-utils.rb
 - test/test-wrapper.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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: test-unit
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 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:
-- test/test-unit-capybara-test-utils.rb
+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