ae_page_objects 3.1.1 → 4.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51699d1972afe7c4720063e3368da2c0cc11d37
-  data.tar.gz: 73904117e141e368ed8bd6405ebfdf863109d61e
+  metadata.gz: dec99451835a9cb58fedf86d01f94171a62c47ec
+  data.tar.gz: cfd06fec6e4da6ea81d5cec3a94e91f21043bc5b
 SHA512:
-  metadata.gz: ad0c6487efda67bc6edfffad47ae13069bf5cb9cb0457945326570fac985ffedee8455a6619ed30673052dac499fed05fca9962a1c226419ca0791968f307bbf
-  data.tar.gz: e9632150f966b13222b994747ee25b0b32858bc4b6f8741d1e6c7cd71ea5caf350c2ee327ddc27ac36f4f1d13d31f13b2fdb462d174204c935cd66b868ac71a9
+  metadata.gz: 92612a7cc134ceee95409dd8e7ef5141d23d14583f34c326d5b78b5b611201bfea2d0c22c50367f6bcc8f145c0b240940b283fd75de5ce0343d0dcb2cd94c1c7
+  data.tar.gz: 603d054ef32af331a10f16da82277a23ae402aa47f53e3cc1480535f1700795646490140a7e3994168d0a24bab13adfba9e703fd9258fca6c774c3223cbea4e6

data/lib/ae_page_objects.rb

@@ -99,11 +99,7 @@ module AePageObjects
     end
 
     def default_max_wait_time
-      if Capybara.respond_to?(:default_max_wait_time)
-        Capybara.default_max_wait_time
-      else
-        Capybara.default_wait_time
-      end
+      Capybara.default_max_wait_time
     end
   end
 end

data/lib/ae_page_objects/element.rb

@@ -99,6 +99,13 @@ module AePageObjects
       if locator.empty?
         parent.node
       else
+        default_options = { minimum: 0 }
+        if locator.last.is_a?(::Hash)
+          locator[-1] = default_options.merge(locator.last)
+        else
+          locator.push(default_options)
+        end
+
         node = AePageObjects.wait_until { parent.node.first(*locator) }
         node.allow_reload!
         node

data/lib/ae_page_objects/elements/collection.rb

@@ -41,7 +41,7 @@ module AePageObjects
     end
 
     def size
-      node.all(:xpath, item_xpath, options).size
+      node.all(:xpath, item_xpath, options.merge(wait: false)).size
     end
 
     def last
@@ -73,29 +73,34 @@ module AePageObjects
       @item_xpath ||= begin
         query_args = eval_locator(@item_locator).dup
 
-        if query_args.first.to_sym == :xpath
+        default_options = {
+          session_options: Capybara.session_options
+        }
+
+        if query_args[1].is_a?(XPath::Expression)
           #
           # Use the { exact: true } setting for XPath selectors that use "XPath.is".  For example, given the XPath
-          #   XPath::HTML.descendant(:div)[XPath.text.is('Example Text')]
+          #   XPath.descendant(:div)[XPath.text.is('Example Text')]
           # the resulting path will be
           #   .//div[./text() = 'Example Text']
           # instead of
           #   .//div[contains(./text(), 'Example Text')]
           # See https://github.com/jnicklas/capybara#exactness for more information.
           #
-          default_options = {:exact => true}
-          if query_args.last.is_a?(::Hash)
-            query_args[-1] = default_options.merge(query_args.last)
-          else
-            query_args.push(default_options)
-          end
+          default_options[:exact] = true
+        end
+
+        if query_args.last.is_a?(::Hash)
+          query_args[-1] = default_options.merge(query_args.last)
+        else
+          query_args.push(default_options)
         end
 
-        query = Capybara::Query.new(*query_args)
+        query = Capybara::Queries::SelectorQuery.new(*query_args)
 
         result = query.xpath
 
-        # if it's CSS, we need to run it through XPath as Capybara::Query#xpath only
+        # if it's CSS, we need to run it through XPath as Capybara::Queries::SelectorQuery#xpath only
         # works when the selector is xpath. Lame.
         if query.selector.format == :css
           result = XPath.css(query.xpath).to_xpath

data/lib/ae_page_objects/node.rb

@@ -17,6 +17,13 @@ module AePageObjects
 
     is_loaded do
       if locator = loaded_locator
+        default_options = { minimum: 0 }
+        if locator.last.is_a?(::Hash)
+          locator[-1] = default_options.merge(locator.last)
+        else
+          locator.push(default_options)
+        end
+
         node.first(*eval_locator(locator)) != nil
       else
         true

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '3.1.1'.freeze
+  VERSION = '4.0.0.pre1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0.pre1
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 description: Capybara Page Objects pattern
 email:
 - engineering@appfolio.com
@@ -72,15 +72,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Capybara Page Objects pattern