test-unit-capybara 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7cf9eb69b534f72d4a3dad72ce1a9f4cf082da1f
-  data.tar.gz: d2d3e629a0696bcc58ed854ca54117d398ec4fc0
+SHA256:
+  metadata.gz: 6eaf21df287fa1ff9257f14b4181d9f2a95341e0aa5cd7466eee01ab41da9b21
+  data.tar.gz: 1aca5c36f7fb08c0f01f6fadd9acfc86b75539c112e104e429c8fefbbcd0473c
 SHA512:
-  metadata.gz: 05a0a4e43abd0a45fd845340d041784f05c99e645c3966f1372158c9a17834bf1ff25ddca401b47ec0d0fe80d9907ba102954abd1db4e6fee3f3e46ebc0ac516
-  data.tar.gz: c6abb4ac9b5119a57091231fa7b2e3c0fdbde9625e45001c19ec13216f3b67c01f088776650e47096b12e1b240ea72adc921e26219ef41331aa780203a496b83
+  metadata.gz: b2c9baefb0b289a55fa146d7d5880d1d6e0561a4690a5740558696c36e08f21f305bcf1301e9c001341492f8bd3c35637b0e8b330cf5afafb7e3cef0423af078
+  data.tar.gz: cb8924383d5653b150241c29a01e766a00772f1eb693a7681d39a954f2a6db16bc830b037d879ee9ab4bb50976b92e3f199e0ec9651417e875606809ee675bb3

data/{README.textile → README.md}

@@ -1,20 +1,20 @@
-h1. test-unit-capybara
+# test-unit-capybara
 
-"Web site":https://github.com/test-unit/test-unit-capybara
+[Web site](https://github.com/test-unit/test-unit-capybara)
 
-h2. Description
+## Description
 
-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-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.
 
-h2. Install
+## Install
 
-<pre>
+```
 % sudo gem install test-unit-capybara
-</pre>
+```
 
-h2. Usage
+## Usage
 
-<pre>
+```ruby
 require 'test/unit/capybara'
 
 class MyRackApplication
@@ -63,7 +63,7 @@ class TestMyRackApplication < Test::Unit::TestCase
       find("ol.navi")
       # This fails with the following message:
       #
-      # <"ol.navi">(:css) expected to find a element in
+      # <"ol.navi">(:css) expected to find an element in
       # <<div class="header">
       #       <p>No navigation.</p>
       #     </div>>
@@ -73,15 +73,28 @@ class TestMyRackApplication < Test::Unit::TestCase
       # It helps you debug a problem without save_and_open_page.
     end
   end
+
+  attribute :js, true
+  def test_destroy_a_post
+    # JavaScript driver is used
+    visit("/")
+    page.accept_confirm do
+      click_on("Destroy", match: :first)
+    end
+
+    within(".alert") do
+      assert_equal("Post was successfully destroyed", text)
+    end
+  end
 end
-</pre>
+```
 
-h2. License
+## License
 
 LGPLv2.1 or later.
 
 (Kouhei Sutou has a right to change the license including contributed patches.)
 
-h2. Authors
+## Authors
 
 * Kouhei Sutou

data/Rakefile

@@ -25,6 +25,7 @@ require 'packnga'
 require "bundler/gem_helper"
 
 base_dir = File.dirname(__FILE__)
+html_base_dir = File.join(base_dir, "doc", "html")
 helper = Bundler::GemHelper.new(base_dir)
 
 def helper.version_tag
@@ -44,6 +45,13 @@ document_task = Packnga::DocumentTask.new(spec) do |task|
 end
 
 Packnga::ReleaseTask.new(spec) do |task|
+  test_unit_github_io_dir_candidates = [
+    "../../www/test-unit.github.io",
+  ]
+  test_unit_github_io_dir = test_unit_github_io_dir_candidates.find do |dir|
+    File.directory?(dir)
+  end
+  task.index_html_dir = test_unit_github_io_dir
 end
 
 desc "Tag the current revision."

data/doc/text/news.md

@@ -0,0 +1,124 @@
+# News
+
+## 1.1.0 - 2021-03-15
+
+### Improvements
+
+* Suppressed a keyword argument warning with Ruby 2.7 or later.
+
+## 1.0.9 - 2019-07-11
+
+### Fixes
+
+* Fixed a bug that this doesn't work with `Rack::Test`.
+
+## 1.0.8 - 2019-07-11
+
+### Improvements
+
+* Added support for Selenium element.
+
+* Updated CI configurations.
+  [GitHub#14][Patch by neko maho]
+
+### Fixes
+
+* Fixed documents.
+  [GitHub#12][GitHub#13][Patch by Akira Matsuda]
+
+### Thanks
+
+* Akira Matsuda
+
+## 1.0.7 - 2018-08-27
+
+### Improvements
+
+* Converted document format to Markdown.
+  [GitHub#8][Patch by okkez]
+
+* Added an example for JavaScript driver.
+  [GitHub#4][GitHub#9][GitHub#10][Patch by okkez]
+
+* Improved support for Capybara 3.
+  [GitHub#11][Patch by neko maho]
+
+### Thanks
+
+  * okkez
+
+  * neko maho
+
+## 1.0.6 - 2018-06-06
+
+### Improvements
+
+* Improved release script.
+  [GitHub#5] [Patch by Hiroyuki Sato]
+
+* Updated documents.
+  [GitHub#6] [Patch by Hiroyuki Sato]
+
+* Added support for Capybara 3.
+  [GitHub#7] [Patch by neko maho]
+
+### Thanks
+
+* Hiroyuki Sato
+
+* Hiroyuki Sato
+
+* neko maho
+
+## 1.0.5 - 2016-01-18
+
+### Improvements
+
+* Stopped to register auto test runner.
+
+## 1.0.4 - 2013-05-15
+
+A Capybara 2.1.0 support release.
+
+### Improvements
+
+* 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]
+
+### Thanks
+
+* thelastinuit
+
+## 1.0.3 - 2012-11-29
+
+A support Capybara 2.0.1 release.
+
+### Improvements
+
+* 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.
+
+## 1.0.2 - 2012-03-12
+
+A Capybara integration improvement release.
+
+### Improvements
+
+  * Supported Capybara 1.1.2 again.
+
+## 1.0.1 - 2012-01-16
+
+A Capybara integration improvement release.
+
+### Improvements
+
+  * Added {Test::Unit::Capybara::Assertions#assert_all}.
+  * Added {Test::Unit::Capybara::Assertions#assert_not_find}.
+  * Supported Capybara::ElementNotFound as a failure.
+
+## 1.0.0 - 2011-05-01
+
+The first release!!!

data/lib/test/unit/capybara.rb

@@ -1,6 +1,4 @@
-# -*- ruby -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2019  Sutou Kouhei <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
@@ -66,18 +64,31 @@ module Test::Unit
 
     # @private
     module FindErrorWrapper
-      def find(*args)
-        begin
+      find_method = ::Capybara::Node::Finders.instance_method(:find)
+      find_parameters = find_method.parameters
+      if find_parameters.any? {|_name, type| type == :options}
+        def find(*args, **options, &optional_filter_block)
+          super
+        rescue ::Capybara::ElementNotFound => error
+          options[:session_options] = session_options
+          query = ::Capybara::Queries::SelectorQuery.new(*args, **options, &optional_filter_block)
+          raise generate_element_not_found(query, error.message)
+        end
+      else
+        def find(*args)
           super
         rescue ::Capybara::ElementNotFound => error
           query = ::Capybara::Query.new(*args)
-          new_error = ElementNotFound.new(self,
-                                          query.selector.name,
-                                          query.locator,
-                                          error.message)
-          raise new_error
+          raise generate_element_not_found(query, error.message)
         end
       end
+
+      def generate_element_not_found(query, message)
+        ElementNotFound.new(self,
+                            query.selector.name,
+                            query.locator,
+                            message)
+      end
     end
 
     # @private
@@ -370,13 +381,17 @@ EOT
         node = nil
         node = args.shift if args[0].is_a?(::Capybara::Node::Base)
         args = normalize_page_finder_arguments(args)
-        if node
-          element = node.first(*args[:finder_arguments])
-        else
-          element = first(*args[:finder_arguments])
+        begin
+          if node
+            element = node.first(*args[:finder_arguments])
+          else
+            element = first(*args[:finder_arguments])
+          end
+        rescue ::Capybara::ExpectationNotMet
+          element = nil
         end
         format = <<-EOT
-<?>(?) expected to not find a element but was
+<?>(?) expected to not find an element but was
 <?> in
 <?>
 EOT
@@ -412,7 +427,7 @@ EOT
       #   It should be specified for useful failure message.
       def flunk_find(base_node, options={})
         format = <<-EOT
-<?>(?) expected to find a element in
+<?>(?) expected to find an element in
 <?>
 EOT
         base_html = AssertionMessage.literal(node_source(base_node))
@@ -471,6 +486,10 @@ EOT
             node.base.source
           elsif node.base.respond_to?(:html)
             node.base.html
+          elsif node.base.respond_to?(:driver) and
+               node.base.driver.respond_to?(:evaluate_script)
+            node.base.driver.evaluate_script("arguments[0].outerHTML",
+                                             node.base)
           else
             node.base.native.to_s
           end

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

@@ -1,6 +1,4 @@
-# -*- ruby -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2019  Sutou Kouhei <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 +17,7 @@
 module Test
   module Unit
     module Capybara
-      VERSION = "1.0.5"
+      VERSION = "1.1.0"
     end
   end
 end

data/test/test-assertions.rb

@@ -167,7 +167,7 @@ HTML
         visit("/")
         h1_html = @html.scan(/<h1>.*?<\/h1>/m)[0]
         message = <<-EOM.strip
-<"h1">(:css) expected to not find a element but was
+<"h1">(:css) expected to not find an element but was
 <#{h1_html}> in
 <#{@html}>
 EOM
@@ -182,7 +182,7 @@ EOM
         section_html = @html.scan(/<div class="section">.*?<\/div>/m)[0]
         h2_in_section_html = section_html.scan(/<h2>.*?<\/h2>/m)[0]
         message = <<-EOM.strip
-<"h2">(:css) expected to not find a element but was
+<"h2">(:css) expected to not find an element but was
 <#{h2_in_section_html}> in
 <#{section_html}>
 EOM
@@ -220,7 +220,7 @@ EOM
         section_html = @html.scan(/<div class="section">.*?<\/div>/m)[0]
         h2_html = section_html.scan(/<h2>.*?<\/h2>/m)[0]
         message = <<-EOM.strip
-<"h2">(:css) expected to not find a element but was
+<"h2">(:css) expected to not find an element but was
 <#{h2_html}> in
 <#{section_html}>
 EOM
@@ -257,14 +257,15 @@ HTML
     def test_pretty_print
       visit("/")
       section_html = @html.scan(/<div class="section">.*?<\/div>/m)[0]
+      element_class = find("html").class
       message = <<-EOM.strip
 <"XXX"> expected but was
-<\#<Capybara::Element tag="div" path="/html/body/div"
+<\#<#{element_class} tag="div" path="/html/body/div"
 #{section_html}>>.
 
 diff:
 - "XXX"
-+ \#<Capybara::Element tag="div" path="/html/body/div"
++ \#<#{element_class} tag="div" path="/html/body/div"
 + <div class="section">
 +       <h2>World</h2>
 +     </div>>

data/test/test-unit-capybara-test-utils.rb

@@ -25,4 +25,8 @@ require "test/unit/capybara"
 require "pp"
 
 tmp_path = File.expand_path(File.join("tmp", "capybara"), __FILE__)
-Capybara.save_and_open_page_path = tmp_path
+if Capybara::VERSION >= "3.0.0.rc1"
+  Capybara.save_path = tmp_path
+else
+  Capybara.save_and_open_page_path= tmp_path
+end

data/test/test-wrapper.rb

@@ -77,7 +77,7 @@ HTML
                  "0 omissions, 0 notifications", result.to_s)
 
     message = <<-EOM.chomp
-<"h3">(:css) expected to find a element in
+<"h3">(:css) expected to find an element in
 <<div class="section">
       <h2>World</h2>
     </div>>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-unit-capybara
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,9 +145,9 @@ extra_rdoc_files: []
 files:
 - COPYING
 - Gemfile
-- README.textile
+- README.md
 - Rakefile
-- doc/text/news.textile
+- doc/text/news.md
 - lib/test/unit/capybara.rb
 - lib/test/unit/capybara/version.rb
 - test/run-test.rb
@@ -173,15 +173,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
-summary: test-unit-capybara is a Capybara adapter for test-unit 2. You can get "Capybara":https://rubygems.org/gems/capybara
+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-assertions.rb
 - test/run-test.rb
+- test/test-assertions.rb
 - test/test-unit-capybara-test-utils.rb
 - test/test-wrapper.rb
-has_rdoc: 

data/doc/text/news.textile

@@ -1,54 +0,0 @@
-h1. News
-
-h2(#1-0-5). 1.0.5 - 2016-01-18
-
-h3. Improvements
-
-* Stopped to register auto test runner.
-
-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.
-
-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.
-
-h3. Improvments
-
-  * Supported Capybara 1.1.2 again.
-
-h2(#1-0-1). 1.0.1 - 2012-01-16
-
-A Capybara integration improvement release.
-
-h3. Improvments
-
-  * Added {Test::Unit::Capybara::Assertions#assert_all}.
-  * Added {Test::Unit::Capybara::Assertions#assert_not_find}.
-  * Supported Capybara::ElementNotFound as a failure.
-
-h2(#1-0-0). 1.0.0 - 2011-05-01
-
-The first release!!!