ae_page_objects 4.3.1.tim1 → 4.3.1.tim5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f569ecce06125424916611b6f8ebc2b78709c1b0d15e02f49e503b1aae0c845
-  data.tar.gz: 374ef8d80600c7a74951a876235776598d124512ab4a6c758e722e38c7f4d20c
+  metadata.gz: a6795ea94086b882084a1277ca3106a196690d56b63c96f875627851c49a85e7
+  data.tar.gz: 5ad6dbc3077f2db4590597ab19a5d41bc71968b4ecdfbebd0a5212d8a377406c
 SHA512:
-  metadata.gz: feddd6e4fefcbe544a2e104ea7b529776907fcf5781fc30c4880778391d625b07b649cfee2ea8ef8b03cd40513661465cd935156cfc40046e44ac4211834e52d
-  data.tar.gz: 0efba04d353e4634b9cecc851bb5452545ecff929e218795813453f2a015c2e5a597a88593b26fdefbad07f55eeb4afbd6532d85f4a5baed922aa0988002a0ef
+  metadata.gz: feb8689c59272e92048748098034cbb26c790f354b513f36721bf7c07eb1045bf1e1bc2183958e7ed9ec553dd0fcc116c8ac593832d39fd1c8b7e93b07f7becc
+  data.tar.gz: 520a8ff36c6071ee05eef2ebcf348dcd101a7c0c6290d73037922b9abe90df9814666077681ed7f01d8cd926e3cd5b3818f360d43e7a37f0471c04ccb559e93f

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(0)
-      true
-    rescue ElementNotVisible
-      false
+      reload_element
+      @loaded_element&.visible?
     end
 
     def hidden?(options = {})
-      wait_until_hidden(0)
-      true
-    rescue ElementNotHidden
-      false
+      !visible?
     end
 
     def present?(options = {})
-      wait_until_present(0)
-      true
-    rescue ElementNotPresent
-      false
+      reload_element
+      !@loaded_element.nil?
     end
 
     def absent?(options = {})
-      wait_until_absent(0)
-      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/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '4.3.1.tim1'.freeze
+  VERSION = '4.3.1.tim5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 4.3.1.tim1
+  version: 4.3.1.tim5
 platform: ruby
 authors:
 - AppFolio Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Capybara Page Objects pattern