ae_page_objects 4.3.1.tim5 → 4.4.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6795ea94086b882084a1277ca3106a196690d56b63c96f875627851c49a85e7
-  data.tar.gz: 5ad6dbc3077f2db4590597ab19a5d41bc71968b4ecdfbebd0a5212d8a377406c
+  metadata.gz: a81fd3e14e49322c4e0ca92ce91305800f7edde065a25f78776cadbeb1192de9
+  data.tar.gz: 3bacbc5553b90bc2e43ffec38a2d2f4de72544f0ec0c3932df0f0901852877e7
 SHA512:
-  metadata.gz: feb8689c59272e92048748098034cbb26c790f354b513f36721bf7c07eb1045bf1e1bc2183958e7ed9ec553dd0fcc116c8ac593832d39fd1c8b7e93b07f7becc
-  data.tar.gz: 520a8ff36c6071ee05eef2ebcf348dcd101a7c0c6290d73037922b9abe90df9814666077681ed7f01d8cd926e3cd5b3818f360d43e7a37f0471c04ccb559e93f
+  metadata.gz: 8b01d530f561624b31f84d6cd50c79380c553e08df964c34cd2316ee2923b913853f3eb69f5dfbb446ef77ab81f6b515b31739dab4615fd452b60d0e735fe939
+  data.tar.gz: c6495b4e601622233ce5f9bed97612fb51cd37a0db4d9c577637c3babad5caec4418a5ab1d26f8b75c3061200d1d5a51fd181af99f66c43534d4267ec87dd488

data/lib/ae_page_objects/element.rb

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

data/lib/ae_page_objects/element_proxy.rb

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

data/lib/ae_page_objects/util/wait_time_manager.rb

@@ -6,13 +6,13 @@ module AePageObjects
     end
 
     def using_wait_time
-      start_time = Time.now
+      start_time = AePageObjects.time_keeper.now
       @wait_time = [@wait_time, @max_time].min
       Capybara.using_wait_time(@wait_time) do
         yield
       end
     ensure
-      if Time.now - start_time > @wait_time
+      if AePageObjects.time_keeper.now - start_time > @wait_time
         @wait_time *= 2
       end
     end

data/lib/ae_page_objects/version.rb

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

data/lib/ae_page_objects.rb

@@ -16,7 +16,7 @@ module AePageObjects
   autoload :Checkbox,          'ae_page_objects/elements/checkbox'
 
   class << self
-    attr_accessor :default_router
+    attr_accessor :default_router, :time_keeper
 
     def browser
       @browser ||= begin
@@ -45,7 +45,7 @@ module AePageObjects
         result = call_wait_until_block(error_message, &block)
       else
         seconds_to_wait ||= default_max_wait_time
-        start_time      = Time.now
+        start_time      = AePageObjects.time_keeper.now
 
         # In an effort to avoid flakiness, Capybara waits, rescues errors, reloads nodes, and
         # retries.
@@ -71,7 +71,7 @@ module AePageObjects
           errors += [WaitTimeoutError]
           raise e unless errors.include?(e.class)
 
-          delay = seconds_to_wait - (Time.now - start_time)
+          delay = seconds_to_wait - (AePageObjects.time_keeper.now - start_time)
 
           if delay <= 0
             # Raising the WaitTimeoutError in the rescue block ensures that Ruby attaches
@@ -80,7 +80,7 @@ module AePageObjects
           end
 
           sleep(0.05)
-          raise FrozenInTime, "Time appears to be frozen" if Time.now == start_time
+          raise FrozenInTime, "Time appears to be frozen" if AePageObjects.time_keeper.now == start_time
 
           retry
         end
@@ -106,3 +106,4 @@ end
 
 require 'ae_page_objects/core/basic_router'
 AePageObjects.default_router = AePageObjects::BasicRouter.new
+AePageObjects.time_keeper = Time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 4.3.1.tim5
+  version: 4.4.0.pre.rc.1
 platform: ruby
 authors:
 - AppFolio Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara