unobtainium-multiwait 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0be5b0d21564f39c671a3ce93b033694a1be33
-  data.tar.gz: edcd6536595cce853ebf59d5cbdb7dffb9a1ee38
+  metadata.gz: d6218c8b4ef791fd979f639879f639599b674aea
+  data.tar.gz: 67ca3493e9c0654d8ae28a12ea553831b6311c3f
 SHA512:
-  metadata.gz: b61d7186397ad199a2d9ce591d3ccb3f03943cb15a3ef9b32799cf6921a66d0ca730cd715d7f46755bcba1993f0bc701f6ad8ddd3f5f1e4e0db62f7c0a7e4499
-  data.tar.gz: 8b76fb36e10b0382d8df528cb163a1e8c86e86f980615b7f773971374fcf47b17c380b8d2e5cde99303e1ed109856e5cf4ca56deb1becaa72136bc234f38168f
+  metadata.gz: 5d9042b75d5fd1667b167deea75f7b447a697d393447fbb472db51450968f7e3914b82cc2588c46ca3acf730e65cd349179b8c107331e32cfcd72134ec0ee190
+  data.tar.gz: b9e605d3b172779bbd905afb600430a5785ce66ab0cb6962295917cee4dfd5aa6f2223cec405bc40b5d81d437d0ded7058c9eeac2a4dece317a87f8063fcd912

data/.rubocop.yml

@@ -70,3 +70,6 @@ Style/NumericLiterals:
 
 Style/FileName:
   Enabled: false
+
+Style/SpaceAfterNot:
+  Enabled: false

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    unobtainium-multiwait (0.1.0)
+    unobtainium-multiwait (0.2.0)
       unobtainium (~> 0.5)
-      unobtainium-multifind (~> 0.2)
+      unobtainium-multifind (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -36,8 +36,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -57,7 +57,7 @@ GEM
     unicode-display_width (1.0.5)
     unobtainium (0.5.0)
       sys-proctable (~> 1.0)
-    unobtainium-multifind (0.2.0)
+    unobtainium-multifind (0.3.0)
       unobtainium (~> 0.5)
     websocket (1.2.3)
     yard (0.8.7.6)
@@ -71,11 +71,11 @@ DEPENDENCIES
   phantomjs
   rake (~> 11.1)
   rspec (~> 3.4)
-  rubocop (~> 0.39)
+  rubocop (~> 0.40)
   selenium-webdriver
   simplecov (~> 0.11)
   unobtainium-multiwait!
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.12.1
+   1.12.3

data/lib/unobtainium-multiwait/multiwait.rb

@@ -33,6 +33,10 @@ module Unobtainium
         # that Selenium::WebDriver::Element responds to, or :exists? if you only
         # care whether the element exists.
         check_element: :displayed?,
+        # The default method to perform the actual find is :find_element, but
+        # you can override this here. The most sensible case would be to use
+        # :find_elements instead, of course.
+        find_method: :find_element,
         # The default wait timeout in seconds.
         timeout: 10,
       }.freeze
@@ -53,12 +57,11 @@ module Unobtainium
 
       ##
       # Wait for multiple elements. Each argument is a Hash of selector options
-      # that are passed to #find_element. If one argument contains keys from
-      # the DEFAULT_OPTIONS Hash, it is instead treated as an options Hash for
-      # the #multiwait method.
+      # that are passed to options[:find_method]. If one argument contains keys
+      # from the DEFAULT_OPTIONS Hash, it is instead treated as an options Hash
+      # for the #multiwait method.
       # @return Array of found elements or nil entries if no matching element
       #   was found.
-      #   FIXME: recheck this!
       def multiwait(*args)
         # Parse options
         options, selectors = multiwait_parse_options(*args)
@@ -68,6 +71,7 @@ module Unobtainium
           raise_on_error: options[:raise_on_error],
           return_errors: options[:return_error],
           check_element: options[:check_element],
+          find_method: options[:find_method],
         }
 
         # Wait for elements
@@ -183,4 +187,5 @@ end # module Unobtainium
 
 ::Unobtainium::Driver.register_module(
     ::Unobtainium::MultiWait::DriverModule,
-    __FILE__)
+    __FILE__
+)

data/lib/unobtainium-multiwait/version.rb

@@ -9,6 +9,6 @@
 module Unobtainium
   module MultiWait
     # The current release version
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0".freeze
   end # module MultiWait
 end # module Unobtainium

data/spec/module_spec.rb

@@ -162,7 +162,8 @@ describe 'Unobtainium::MultiWait::DriverModule' do
       expect(elems[0]).not_to be_nil
       expect(elems[1]).not_to be_nil
       is_error = elems[0].is_a?(
-       ::Selenium::WebDriver::Error::TimeOutError)
+        ::Selenium::WebDriver::Error::TimeOutError
+      )
       expect(is_error).to be_truthy
     end
 

data/unobtainium-multiwait.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.requirements  = "Unobtainium driver implementing the Selenium API"
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rubocop", "~> 0.39"
+  spec.add_development_dependency "rubocop", "~> 0.40"
   spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "simplecov", "~> 0.11"
@@ -50,7 +50,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "phantomjs"
 
   spec.add_dependency "unobtainium", "~> 0.5"
-  spec.add_dependency "unobtainium-multifind", "~> 0.2"
+  spec.add_dependency "unobtainium-multifind", "~> 0.3"
 end
 # rubocop:enable Style/SpaceAroundOperators
 # rubocop:enable Style/UnneededPercentQ, Style/ExtraSpacing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unobtainium-multiwait
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: "\n    This gem provides a driver module for unobtainium allowing for
   more easily\n    waiting for (one of) multiple elements to change state.\n\n    It
   is based on the unobtainium-multifind gem.\n  "