capybara-ui 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8569e04fe7e820a732b875283667700db0021f11
-  data.tar.gz: eab7f283b1ac93ceb0a1ff5db4d4319bf4f8b687
+SHA256:
+  metadata.gz: 566be4cd822be8a8a26f04c7158994d224e36c8d47310c13c4197c3673628510
+  data.tar.gz: 64cdb5bb0c58acce07a3ed901d1f119b2723abe336aacf54f587e58169c990d6
 SHA512:
-  metadata.gz: 703a2e188f63c0e896b1a9df815dad5df846bcb30882d6618168b207b2f19a6736f84ddfe3c2751ed2cd92f536355c0320e0ea53de0964c562aa0704ac9db33d
-  data.tar.gz: cd41f9dd5368aba4585a365c321b399aa3c55c329990f68f66b4ebbd1181de4f98dc429c9d85f959176b559035db89e6003d8945ea4cfd0feeb8196d5d18a3cb
+  metadata.gz: ef9ae00b13c0dc0de05ee6fce7866fe69468a5abb63426e3bc15c34f0f3ed93722fb4c2317ed7fe4461e9759d2d8200f64fc2343e89fc443c16e94a40ebd20a3
+  data.tar.gz: c03f740d4457a54f8e29a31aa9d2552073e99641b2de1c4f38044298c9e9510b0bc7a261256f8148596d055b4c32600ea7fb3a4d12c09060b2b5e5bc3880e440

data/lib/capybara/ui/capybara.rb

@@ -1,7 +1,6 @@
 Capybara.configure do |config|
   config.match = :one
   config.exact = true
-  config.exact_options = true
   config.ignore_hidden_elements = true
   config.visible_text_only = true
 end

data/lib/capybara/ui/checkpoint.rb

@@ -14,11 +14,6 @@ module Capybara
 
       self.rescuable_errors = [StandardError]
 
-      if defined?(RSpec)
-        require 'rspec/expectations'
-        self.rescuable_errors << RSpec::Expectations::ExpectationNotMetError
-      end
-
       class Timer
         class Frozen < StandardError; end
 

data/lib/capybara/ui/matchers.rb

@@ -1,12 +1,20 @@
+def permitted_rspec_version?
+  defined? RSpec && actual_rspec_expectations_version >= required_rspec_expectations_version
+end
+
+def actual_rspec_expectations_version
+  defined? RSpec && Gem::Version.new(RSpec::Expectations::Version::STRING)
+end
+
+def required_rspec_expectations_version
+  Gem::Version.new(Capybara::UI::OptionalDependencies::RSPEC_VERSION)
+end
+
 begin
   require 'rspec/matchers'
-  require 'rspec/version'
+  require 'rspec/expectations/version'
 
-  unless Gem::Version.new(RSpec::Version::STRING) >= Gem::Version.new(Capybara::UI::OptionalDependencies::RSPEC_VERSION)
-    raise LoadError,
-      "requires RSpec version #{Capybara::UI::OptionalDependencies::RSPEC_VERSION} or later. " \
-      "You have #{RSpec::Version::STRING}."
-  end
+  raise LoadError unless permitted_rspec_version?
 
   RSpec::Matchers.define :see do |widget_name, *args|
     match do |role|
@@ -17,6 +25,10 @@ begin
       end
     end
 
+    failure_message do
+      "Could not find widget(#{widget_name}, args.join(', ')) on page."
+    end
+
     match_when_negated do |role|
       begin
         eventually { !role.see?(widget_name, *args) }
@@ -24,5 +36,13 @@ begin
         false
       end
     end
+
+    failure_message_when_negated do
+      "Unexpectedly found widget(#{widget_name}, args.join(', ')) on page."
+    end
   end
+
+rescue LoadError
+  "RSpec Expectations version #{required_rspec_expectations_version} or later is required. " \
+  "You have #{actual_rspec_expectations_version}."
 end

data/lib/capybara/ui/rspec.rb

@@ -0,0 +1,3 @@
+require 'rspec/expectations'
+
+Capybara::UI::Checkpoint.rescuable_errors << RSpec::Expectations::ExpectationNotMetError

data/lib/capybara/ui/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module UI
-    VERSION = '1.0.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/capybara/ui/widgets.rb

@@ -29,7 +29,7 @@ module Capybara
       def Decimal(*selector)
         Widget(selector) { |text|
           # ensure we can convert to float first
-          Float(text) && BigDecimal.new(text)
+          Float(text) && BigDecimal(text)
         }
       end
     end

data/lib/capybara/ui/widgets/cucumber_methods.rb

@@ -2,7 +2,7 @@ module Capybara
   module UI
     module CucumberMethods
       begin
-        require 'cucumber/ast/table'
+        require 'cucumber/multiline_argument/data_table'
 
         # Compares this widget with the given Cucumber +table+.
         #
@@ -24,7 +24,7 @@ module Capybara
           to_table = self.to_table
 
           if ignore_case == true
-            table = downcase_table(table)
+            table = Cucumber::MultilineArgument::DataTable.from(downcase_array(table.raw))
             to_table = downcase_array(to_table)
           end
 
@@ -33,10 +33,6 @@ module Capybara
 
         private
 
-        def downcase_table(table)
-          new_cucumber_table downcase_array(table.raw)
-        end
-
         def downcase_array(array)
           array.map do |item|
             case item
@@ -63,10 +59,6 @@ module Capybara
           end
         end
 
-        def new_cucumber_table(table)
-          Cucumber::Ast::Table.new(table)
-        end
-
       rescue LoadError
         # *crickets*
       end

data/lib/capybara/ui/widgets/field_group.rb

@@ -313,7 +313,7 @@ module Capybara
       end
 
       # Converts the current field group into a table suitable for diff'ing
-      # with Cucumber::Ast::Table.
+      # with Cucumber::MultilineArgument::DataTable.
       #
       # Field labels are determined by the widget name.
       #

data/lib/capybara/ui/widgets/list.rb

@@ -195,7 +195,9 @@ module Capybara
       end
 
       def items
-        item_filter.nodes(self).map { |node| item_for(node) }
+        Capybara.using_wait_time(0) do
+          item_filter.nodes(self).map { |node| item_for(node) }
+        end
       end
     end
   end

data/lib/capybara/ui/widgets/list_item.rb

@@ -2,7 +2,7 @@ module Capybara
   module UI
     class ListItem < Widget
       # Returns this ListItem's contents formatted as a row, for comparison with a
-      # Cucumber::Ast::Table. By default, it simply returns an array with a single
+      # Cucumber::MultilineArgument::DataTable. By default, it simply returns an array with a single
       # element--the widget's text.
       #
       # In general, this method will be called by List#to_table.
@@ -13,7 +13,7 @@ module Capybara
       # Usually, if the default return value isn't what you want, you'll probably
       # want to return a Hash where both keys and values are strings, so that you
       # don't need to worry about column order when you pass the table to
-      # Cucumber::Ast::Table#diff!.
+      # Cucumber::MultilineArgument::DataTable#diff!.
       #
       # See List#to_table for more information.
       def to_row

data/lib/capybara/ui/widgets/string_value.rb

@@ -2,7 +2,13 @@ module Capybara
   module UI
     class StringValue < String
       def to_date(format = nil)
-        format ? Date.strptime(self, format) : super()
+        if format
+          Date.strptime(self, format)
+        elsif defined?(super)
+          super()
+        else
+          Date.parse(self)
+        end
       end
 
       def to_key

data/lib/capybara/ui/widgets/widget/node_filter.rb

@@ -9,19 +9,23 @@ module Capybara
         end
 
         def node(parent_widget, *args)
-          parent_widget.root.find(*capybara_selector(*args))
+          a, kw = capybara_selector(*args)
+          parent_widget.root.find(*a, **kw)
         end
 
         def node?(parent_widget, *args)
-          parent_widget.root.has_selector?(*capybara_selector(*args))
+          a, kw = capybara_selector(*args)
+          parent_widget.root.has_selector?(*a, **kw)
         end
 
         def nodeless?(parent_widget, *args)
-          parent_widget.root.has_no_selector?(*capybara_selector(*args))
+          a, kw = capybara_selector(*args)
+          parent_widget.root.has_no_selector?(*a, **kw)
         end
 
         def nodes(parent_widget, *args)
-          parent_widget.root.all(*capybara_selector(*args))
+          a, kw = capybara_selector(*args)
+          parent_widget.root.all(*a, **kw)
         end
 
         private
@@ -39,9 +43,9 @@ module Capybara
           defaults = {:wait => 0}
 
           if Hash === selector.last
-            selector + [defaults.merge(selector.pop)]
+            return selector, defaults.merge(selector.pop)
           else
-            selector + [defaults]
+            return selector, defaults
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-ui
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - David Leal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -31,70 +31,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cuprite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -143,16 +185,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -172,7 +214,7 @@ description: Capybara-UI (formerly called Dill) is a Capybara abstraction that m
   easier.
 email:
 - dleal@mojotech.com
-- ags@mojotech.com
+- ops@mojotech.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -190,6 +232,7 @@ files:
 - lib/capybara/ui/rails.rb
 - lib/capybara/ui/rails/role.rb
 - lib/capybara/ui/role.rb
+- lib/capybara/ui/rspec.rb
 - lib/capybara/ui/text_table.rb
 - lib/capybara/ui/text_table/cell_text.rb
 - lib/capybara/ui/text_table/mapping.rb
@@ -236,8 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A set of helpers to ease integration testing