ae_page_objects 4.4.0.pre.rc.1 → 5.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a81fd3e14e49322c4e0ca92ce91305800f7edde065a25f78776cadbeb1192de9
-  data.tar.gz: 3bacbc5553b90bc2e43ffec38a2d2f4de72544f0ec0c3932df0f0901852877e7
+  metadata.gz: 050326bd45948e6541587873da40715708f854333d9965816e0d7d78d54d33bb
+  data.tar.gz: baaa65ec6da2ef99f462d2259e8add8920654897e078dabe2b0b237c7f57b390
 SHA512:
-  metadata.gz: 8b01d530f561624b31f84d6cd50c79380c553e08df964c34cd2316ee2923b913853f3eb69f5dfbb446ef77ab81f6b515b31739dab4615fd452b60d0e735fe939
-  data.tar.gz: c6495b4e601622233ce5f9bed97612fb51cd37a0db4d9c577637c3babad5caec4418a5ab1d26f8b75c3061200d1d5a51fd181af99f66c43534d4267ec87dd488
+  metadata.gz: 370ec5c9073399673f4cd498b35440319c8c81677d4c198a835a6ed56d8859da8333129315b1306119e9e6ac6559a2fc412c0e51c81f7fcfe0414ef907779305
+  data.tar.gz: 694053ed1cf77a4258c8c68a4652f02f6ec5a52b778e77f79d78d881610416e693b5cc19c4ce427e01c60a7b7bc92d38ec4f4f4656331221bd158028cef10ecb

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

@@ -15,32 +15,22 @@ module AePageObjects
       @loaded_element = nil
     end
 
-    def visible?(options = {})
-      wait_until_visible(options[:wait])
-      true
-    rescue ElementNotVisible
-      false
+    def visible?
+      reload_element
+      @loaded_element&.visible?
     end
 
-    def hidden?(options = {})
-      wait_until_hidden(options[:wait])
-      true
-    rescue ElementNotHidden
-      false
+    def hidden?
+      !visible?
     end
 
-    def present?(options = {})
-      wait_until_present(options[:wait])
-      true
-    rescue ElementNotPresent
-      false
+    def present?
+      reload_element
+      !@loaded_element.nil?
     end
 
-    def absent?(options = {})
-      wait_until_absent(options[:wait])
-      true
-    rescue ElementNotAbsent
-      false
+    def absent?
+      !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.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/util/wait_time_manager.rb

@@ -6,13 +6,13 @@ module AePageObjects
     end
 
     def using_wait_time
-      start_time = AePageObjects.time_keeper.now
+      start_time = Time.now
       @wait_time = [@wait_time, @max_time].min
       Capybara.using_wait_time(@wait_time) do
         yield
       end
     ensure
-      if AePageObjects.time_keeper.now - start_time > @wait_time
+      if Time.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.4.0.pre.rc.1'.freeze
+  VERSION = '5.0.0.pre1'.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, :time_keeper
+    attr_accessor :default_router
 
     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      = AePageObjects.time_keeper.now
+        start_time      = Time.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 - (AePageObjects.time_keeper.now - start_time)
+          delay = seconds_to_wait - (Time.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 AePageObjects.time_keeper.now == start_time
+          raise FrozenInTime, "Time appears to be frozen" if Time.now == start_time
 
           retry
         end
@@ -106,4 +106,3 @@ 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.4.0.pre.rc.1
+  version: 5.0.0.pre1
 platform: ruby
 authors:
 - AppFolio Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara