ae_page_objects 5.0.0.tim1 → 6.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbfd8677597cf0026b13d31f3a468148cedab2df
-  data.tar.gz: 7385fcd650b5ea30d077e6fd7fcc23c997808fc1
+SHA256:
+  metadata.gz: d03326a2bcedb51c1d268690baee1c9adea3c44cada101beaa4f414c22a74946
+  data.tar.gz: 80e7c8b74ee935f28e1b80c7c698659d6d9f58b9886d087f10f8e3f2ee191820
 SHA512:
-  metadata.gz: d1bd1f9f15668d99c7ed9e9ff604bd54d23b5159d702b01188194b51fcc145614dc960bf242216fd7b7976b909523dc06a226e465cc5b4599c9b2b87d37665b1
-  data.tar.gz: 2de8621bfc85d7c66306af7c9761e3b0a57692bc307c97e2df1a23f003334867be5dd2cd039d5051c05add08e0e1dd1199972630ce2ddb1dba9ceb0b148d2fa2
+  metadata.gz: 4f4f9b6b8042099edbba969631a2c09ac94466cb62ec898d8249c81eac70052a100ca79d400b0aef4fb6e32f40bf06cf93e4fafee641f6241be4d2e66d69de3b
+  data.tar.gz: b787fa1e7d7ed7bcc76ddfe44061092b9807a3454188e7d0d4e16550231decfc670f022c4b24cdd186fad7c22c4179e39b3cb310a87793acc3a1c3a5c2b6fb06

data/ae_page_objects.gemspec

@@ -0,0 +1,23 @@
+
+# frozen_string_literal: true
+
+require_relative 'lib/ae_page_objects/version'
+
+Gem::Specification.new do |spec|
+  spec.name                  = 'ae_page_objects'
+  spec.version               = AePageObjects::VERSION
+  spec.platform              = Gem::Platform::RUBY
+  spec.author                = 'AppFolio'
+  spec.email                 = 'opensource@appfolio.com'
+  spec.description           = 'Capybara Page Objects pattern.'
+  spec.summary               = spec.description
+  spec.homepage              = 'https://github.com/appfolio/ae_page_objects'
+  spec.license               = 'MIT'
+  spec.files                 = Dir['**/*'].select { |f| f[%r{^(lib/|LICENSE.txt|.*gemspec)}] }
+  spec.require_paths         = ['lib']
+  spec.required_ruby_version = Gem::Requirement.new('>= 3')
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.add_dependency('capybara', ['>= 3', '< 4'])
+end

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,22 @@ module AePageObjects
 
     def scoped_node
       locator = eval_locator(@locator)
-      if locator.empty?
-        parent.node
-      else
-        default_options = { minimum: 0 }
-        if locator.last.is_a?(::Hash)
-          locator[-1] = default_options.merge(locator.last)
-        else
-          locator.push(default_options)
-        end
 
-        node = AePageObjects.wait_until { parent.node.first(*locator) }
-        node.allow_reload!
-        node
+      return parent.node if locator.empty?
+
+      default_options = { minimum: 0 }
+      if locator.last.is_a?(::Hash)
+        default_options.merge!(locator.pop)
+      end
+
+      if @wait
+        node = AePageObjects.wait_until { parent.node.first(*locator, **default_options) }
+      else
+        node = parent.node.first(*locator, **default_options)
+        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/elements/collection.rb

@@ -52,7 +52,7 @@ module AePageObjects
       # wait time set to 0.
       #
       Capybara.using_wait_time(0) do
-        node.all(:xpath, item_xpath, options).size
+        node.all(:xpath, item_xpath, **options).size
       end
     end
 
@@ -90,7 +90,6 @@ module AePageObjects
         }
 
         if query_args[1].is_a?(XPath::Expression)
-          #
           # Use the { exact: true } setting for XPath selectors that use "XPath.is".  For example, given the XPath
           #   XPath.descendant(:div)[XPath.text.is('Example Text')]
           # the resulting path will be
@@ -98,17 +97,14 @@ module AePageObjects
           # instead of
           #   .//div[contains(./text(), 'Example Text')]
           # See https://github.com/jnicklas/capybara#exactness for more information.
-          #
           default_options[:exact] = true
         end
 
         if query_args.last.is_a?(::Hash)
-          query_args[-1] = default_options.merge(query_args.last)
-        else
-          query_args.push(default_options)
+          default_options.merge!(query_args.pop)
         end
 
-        query = Capybara::Queries::SelectorQuery.new(*query_args)
+        query = Capybara::Queries::SelectorQuery.new(*query_args, **default_options)
 
         result = query.xpath
 

data/lib/ae_page_objects/node.rb

@@ -22,12 +22,10 @@ module AePageObjects
       else
         default_options = { wait: false }
         if locator.last.is_a?(::Hash)
-          locator[-1] = default_options.merge(locator.last)
-        else
-          locator.push(default_options)
+          default_options.merge!(locator.pop)
         end
 
-        node.all(*locator).any?
+        node.all(*locator, **default_options).any?
       end
     end
 

data/lib/ae_page_objects/rails/application_router.rb

@@ -4,9 +4,7 @@ module AePageObjects
   class ApplicationRouter < BasicRouter
 
     # This whole file is a kludge and probably belongs in an ae_page_objects-rails extension
-
     module Recognizer
-
       class Base
         def generate_path(named_route, *args)
           if routes.respond_to?("#{named_route}_path")
@@ -32,7 +30,7 @@ module AePageObjects
           false
         end
 
-      private
+        private
 
         def routes
           raise NotImplementedError, "You must implement routes"
@@ -60,9 +58,8 @@ module AePageObjects
         ResolvedRoute = Struct.new(:controller, :action)
       end
 
-      class Rails3 < Base
-
-      private
+      class Rails6Plus < Base
+        private
 
         def request_for(url, method)
           ::Rails.application.routes.request_class.new(env_for(url, method))
@@ -77,7 +74,8 @@ module AePageObjects
         end
 
         def normalize_url(url)
-          Rack::Mount::Utils.normalize_path(url) unless url =~ %r{://}
+          require 'action_dispatch/journey'
+          ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
         end
 
         def router
@@ -93,25 +91,6 @@ module AePageObjects
           end
         end
       end
-
-      class Rails32 < Rails3
-
-      private
-
-        def normalize_url(url)
-          Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
-        end
-      end
-
-      class Rails4Plus < Rails32
-
-      private
-
-        def normalize_url(url)
-          require 'action_dispatch/journey'
-          ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
-        end
-      end
     end
 
     def path_recognizes_url?(path, url)
@@ -133,16 +112,12 @@ module AePageObjects
     private
 
     def recognizer
-      @recognizer ||= case ::Rails.version
-        when /\A3\.[01]/
-          Recognizer::Rails3.new
-        when /\A3\.2/
-          Recognizer::Rails32.new
-        when /\A(4\.[012]|5\.0)/
-          Recognizer::Rails4Plus.new
+      @recognizer ||= case ::Rails.gem_version
+        when Gem::Requirement.new('>= 6.0', '< 8.0')
+          Recognizer::Rails6Plus.new
         else
           warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner."
-          Recognizer::Rails4Plus.new
+          Recognizer::Rails6Plus.new
       end
     end
   end

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '5.0.0.tim1'.freeze
+  VERSION = '6.0.0.pre1'.freeze
 end

metadata

@@ -1,36 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 5.0.0.tim1
+  version: 6.0.0.pre1
 platform: ruby
 authors:
-- AppFolio Engineering
-autorequire: 
+- AppFolio
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: Capybara Page Objects pattern
-email:
-- engineering@appfolio.com
+        version: '4'
+description: Capybara Page Objects pattern.
+email: opensource@appfolio.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ae_page_objects.gemspec
 - lib/ae_page_objects.rb
 - lib/ae_page_objects/core/basic_router.rb
 - lib/ae_page_objects/core/dsl.rb
@@ -60,11 +66,12 @@ files:
 - lib/ae_page_objects/util/internal_helpers.rb
 - lib/ae_page_objects/util/wait_time_manager.rb
 - lib/ae_page_objects/version.rb
-homepage: http://github.com/appfolio/ae_page_objects
+homepage: https://github.com/appfolio/ae_page_objects
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,16 +79,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.5
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
-summary: Capybara Page Objects pattern
+summary: Capybara Page Objects pattern.
 test_files: []