ae_page_objects 4.2.0 → 4.3.1.tim4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e86f8c6ca1008d93ea5bdbdb7d2fe453b2087e966f0f02af7e4645d052e069
-  data.tar.gz: 5c83705d0a2615f86430c6a24ab902660d557a112ca1407c27a6eef239cf7ad6
+  metadata.gz: dee3d840775da65eaa16425c78f811a06f91979fbccbbb43ac9f90591af181a8
+  data.tar.gz: 517c36c4ac90c5762c776a65e3c1bb66f50a83f3ad033671690ec23dbf268bea
 SHA512:
-  metadata.gz: 4df20f9855a011e7d57182dd83c0fe5ac995bf7146912674843e1bc446f8baff9d75f10eb68399c9e04136301fb50fc5325643b5194471dd0f18e790ae073bb7
-  data.tar.gz: e80741c88ce3db5e8ad83cb18285fba48df172e119bac308f65c71404523944655ad336b8813939cf0e5d6b19c9f655678afdc943c0f793b01965d71e8dc0c5f
+  metadata.gz: 4c536cc96e5bc40d1b9c3566e7f5615e8708a29a890e0a0f4da1f221222f2622d1882a2bf53a12e0f940932c8c8de7098f373756aefa5e68d893534d23ddf747
+  data.tar.gz: faf31a82c8416aa904eebafdf6dd4c5e5868a6b5b227e7e6df56300389fea5aa08ea87a021a7e155d71faa583163a2a60e233e47267dd85884e6850faa323e29

data/lib/ae_page_objects/element.rb

@@ -89,6 +89,11 @@ module AePageObjects
     def configure(options)
       @locator = options.delete(:locator)
       @name    = options.delete(:name)
+      if options.key?(:wait)
+        @wait = options.delete(:wait)
+      else
+        @wait = true
+      end
 
       @name = @name.to_s if @name
     end
@@ -107,20 +112,24 @@ module AePageObjects
 
     def scoped_node
       locator = eval_locator(@locator)
-      if locator.empty?
-        parent.node
+
+      return parent.node if locator.empty?
+
+      default_options = { minimum: 0 }
+      if locator.last.is_a?(::Hash)
+        locator[-1] = default_options.merge(locator.last)
       else
-        default_options = { minimum: 0 }
-        if locator.last.is_a?(::Hash)
-          locator[-1] = default_options.merge(locator.last)
-        else
-          locator.push(default_options)
-        end
+        locator.push(default_options)
+      end
 
+      if @wait
         node = AePageObjects.wait_until { parent.node.first(*locator) }
-        node.allow_reload!
-        node
+      else
+        node = parent.node.first(*locator)
+        raise LoadingElementFailed, 'Element Not Found' unless node
       end
+      node.allow_reload!
+      node
     rescue AePageObjects::WaitTimeoutError => e
       raise LoadingElementFailed, e.message
     end

data/lib/ae_page_objects/element_proxy.rb

@@ -16,31 +16,21 @@ module AePageObjects
     end
 
     def visible?(options = {})
-      wait_until_visible(options[:wait])
-      true
-    rescue ElementNotVisible
-      false
+      reload_element
+      @loaded_element&.visible?
     end
 
     def hidden?(options = {})
-      wait_until_hidden(options[:wait])
-      true
-    rescue ElementNotHidden
-      false
+      !visible?
     end
 
     def present?(options = {})
-      wait_until_present(options[:wait])
-      true
-    rescue ElementNotPresent
-      false
+      reload_element
+      !@loaded_element.nil?
     end
 
     def absent?(options = {})
-      wait_until_absent(options[:wait])
-      true
-    rescue ElementNotAbsent
-      false
+      !present?
     end
 
     def presence
@@ -123,8 +113,19 @@ module AePageObjects
 
     private
 
-    def load_element
-      @element_class.new(*@args)
+    def load_element(wait: true)
+      args = @args.dup
+
+      options_or_locator = args.pop
+      options = if options_or_locator.is_a?(Hash)
+                  options_or_locator.dup.merge(wait: wait)
+                else
+                  { locator: options_or_locator, wait: wait }
+                end
+
+      args << options
+
+      @element_class.new(*args)
     end
 
     def implicit_element
@@ -132,7 +133,7 @@ module AePageObjects
     end
 
     def reload_element
-      @loaded_element = load_element
+      @loaded_element = load_element(wait: false)
     rescue LoadingElementFailed
       @loaded_element = nil
     end

data/lib/ae_page_objects/rails/application_router.rb

@@ -133,12 +133,12 @@ module AePageObjects
     private
 
     def recognizer
-      @recognizer ||= case ::Rails.version
-        when /\A3\.[01]/
+      @recognizer ||= case ::Rails.gem_version
+        when Gem::Requirement.new('>= 3.0', '< 3.2')
           Recognizer::Rails3.new
-        when /\A3\.2/
+        when Gem::Requirement.new('~> 3.2')
           Recognizer::Rails32.new
-        when /\A(4\.[012]|5\.0)/
+        when Gem::Requirement.new('>= 4.0', '< 7.0')
           Recognizer::Rails4Plus.new
         else
           warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner."

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '4.2.0'.freeze
+  VERSION = '4.3.1.tim4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1.tim4
 platform: ruby
 authors:
 - AppFolio Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -64,7 +64,7 @@ homepage: http://github.com/appfolio/ae_page_objects
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,13 +75,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Capybara Page Objects pattern
 test_files: []