ae_page_objects 5.0.0.tim1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbfd8677597cf0026b13d31f3a468148cedab2df
-  data.tar.gz: 7385fcd650b5ea30d077e6fd7fcc23c997808fc1
+SHA256:
+  metadata.gz: 9ac141566f7fa0ef821de7597f5ca1c52d8e20a2a73a772c186631ea9340b3ba
+  data.tar.gz: e43b377ece706710f77792e4e7a4540160bd94ee4d81f0f5e6e8b360df452a49
 SHA512:
-  metadata.gz: d1bd1f9f15668d99c7ed9e9ff604bd54d23b5159d702b01188194b51fcc145614dc960bf242216fd7b7976b909523dc06a226e465cc5b4599c9b2b87d37665b1
-  data.tar.gz: 2de8621bfc85d7c66306af7c9761e3b0a57692bc307c97e2df1a23f003334867be5dd2cd039d5051c05add08e0e1dd1199972630ce2ddb1dba9ceb0b148d2fa2
+  metadata.gz: 67411eea6351ede5cf53ba6944b5ab15ee1066208df1afb7d493dbe6a99de623881d8742fbb764ef04a92103f6432af9dbc597ffb6e0d0fad02b0ad3842ae4d2
+  data.tar.gz: 83146923f3c423858fbaddafd47f0532bfd5c6b7658e256766d6bbb697c1228eb3f57c4776526694278b0b75dc7946dda8bf4f809d280b447081d36a9793c920

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,36 +15,22 @@ module AePageObjects
       @loaded_element = nil
     end
 
-    def visible?(options = {})
-      options[:wait] ||= 0
-      wait_until_visible(options[:wait])
-      true
-    rescue ElementNotVisible
-      false
+    def visible?
+      reload_element
+      @loaded_element&.visible?
     end
 
-    def hidden?(options = {})
-      options[:wait] ||= 0
-      wait_until_hidden(options[:wait])
-      true
-    rescue ElementNotHidden
-      false
+    def hidden?
+      !visible?
     end
 
-    def present?(options = {})
-      options[:wait] ||= 0
-      wait_until_present(options[:wait])
-      true
-    rescue ElementNotPresent
-      false
+    def present?
+      reload_element
+      !@loaded_element.nil?
     end
 
-    def absent?(options = {})
-      options[:wait] ||= 0
-      wait_until_absent(options[:wait])
-      true
-    rescue ElementNotAbsent
-      false
+    def absent?
+      !present?
     end
 
     def presence
@@ -127,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
@@ -136,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 = '5.0.0.tim1'.freeze
+  VERSION = '5.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 5.0.0.tim1
+  version: 5.0.0
 platform: ruby
 authors:
 - AppFolio Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2021-09-20 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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Capybara Page Objects pattern
 test_files: []