ae_page_objects 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be4cfb96f4b15a435ce587e4821dd6e1c1f6165
-  data.tar.gz: e866450111689a5edcd99a61c514494b8791980b
+  metadata.gz: e5eeebecb74ccaec9739afd6183c3d8906ce2b9e
+  data.tar.gz: 6752901420af4fe99325e9735cbc3a5e9ddf68de
 SHA512:
-  metadata.gz: 472aa891add7f3d89473045b128d6d179c99593434099af085a533e049ad762e64207528ceb2eba6b6d5e8be97f2e327c96bb790f2c7d4933f386cbde1fa7147
-  data.tar.gz: 400a3f13461bcda18bbe715d9ce1286bea2dfc5ff7ff191f28bd1988fffdb4a532b21c51e797294e4c66581ccb3860d55a5ebfec960753d92eccd96e0f7e3d60
+  metadata.gz: 4b420a7c14fcde32afb609815550643a84b828f58654ebee477e4ef3bbf762ef70ff01ad16d09f174a68eddaa881cb706e3656fc7153a2ed1df401cb409f28ea
+  data.tar.gz: 25adc0b0e01e95ed700ee6a1bae61544662441b877778609db2449c091e36bb419c45ed5459a68e7a435b3ddd1d2391d9ab392cd5a41d9c6d3ba8cf60dba818c

data/lib/ae_page_objects/core/application_router.rb

@@ -16,10 +16,24 @@ module AePageObjects
       class Rails23 < Base
         def recognizes?(path, url)
           ["GET", "PUT", "POST", "DELETE", "PATCH"].map(&:downcase).map(&:to_sym).each do |method|
-            route = ActionController::Routing::Routes.named_routes[path]
-            route.recognize(url, {:method => method})
+            path_route_result = ActionController::Routing::Routes.named_routes[path].requirements
+            recognized_result = nil
+
+            begin
+              recognized_result = ActionController::Routing::Routes.recognize_path(url, {:method => method}).select do
+              |key, _|
+                key.to_s.match(/(controller|action)/)
+              end
+            rescue ActionController::MethodNotAllowed
+            end
 
-            return true if route && route.recognize(url, {:method => method})
+            # Only the first recognized path returned by Rails is considered,
+            # which means, we only want highest prioritized route.
+            if recognized_result && path_route_result == Hash[recognized_result]
+              return true
+            else
+              next
+            end
           end
 
           false
@@ -44,14 +58,18 @@ module AePageObjects
 
           ["GET", "PUT", "POST", "DELETE", "PATCH"].each do |method|
             router.recognize(request_for(url, method)) do |route, matches, params|
-              return true if route.name.to_s == path.to_s
+              if route.name.to_s == path.to_s
+                return true
+              else
+                # We break the inner loop here because only the first recognized path returned by Rails is considered,
+                # which means, we only want highest prioritized route.
+                break
+              end
             end
           end
-
           false
         end
 
-
       private
 
         def request_for(url, method)
@@ -86,6 +104,7 @@ module AePageObjects
       class Rails32 < Rails3
 
       private
+
         def url_and_router(url)
           url = Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
           router = ::Rails.application.routes.router
@@ -96,7 +115,8 @@ module AePageObjects
 
       class Rails4 < Rails32
 
-        private
+      private
+
         def url_and_router(url)
           require 'action_dispatch/journey'
           url = ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
@@ -105,7 +125,6 @@ module AePageObjects
           [url, router]
         end
       end
-
     end
 
     def path_recognizes_url?(path, url)

data/lib/ae_page_objects/core/dsl.rb

@@ -143,14 +143,14 @@ module AePageObjects
 
       item_class = options.delete(:contains) || options[:is].item_class
       if block_given?
-        item_class = item_class.new_subclass(&block).tap do |new_item_class|
+        item_class = Class.new(item_class, &block).tap do |new_item_class|
           new_item_class.element_attributes.merge!(item_class.element_attributes)
         end
       end
 
       # since we are creating a new item class, we need to subclass the collection class
       # so we can parameterize the collection class with an item class
-      options[:is] = options[:is].new_subclass
+      options[:is] = Class.new(options[:is])
       options[:is].item_class = item_class
 
       element(name, options)
@@ -162,7 +162,7 @@ module AePageObjects
       raise ArgumentError, ":is option not supported" if options[:is]
       raise ArgumentError, "Block required." if block.nil?
 
-      klass = ::AePageObjects::Form.new_subclass(&block)
+      klass = Class.new(::AePageObjects::Form, &block)
 
       options      = options.dup
       options[:is] = klass
@@ -186,7 +186,7 @@ module AePageObjects
       klass = options.delete(:is) || ::AePageObjects::Element
 
       if block_given?
-        klass.new_subclass(&block)
+        Class.new(klass, &block)
       else
         klass
       end

data/lib/ae_page_objects/element_proxy.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 module AePageObjects
   class ElementProxy
 
@@ -14,6 +12,8 @@ module AePageObjects
     def initialize(element_class, *args)
       @element_class = element_class
       @args          = args
+
+      @loaded_element = nil
     end
 
     # Provided so that visible? can be asked without
@@ -33,21 +33,45 @@ module AePageObjects
     end
 
     def present?
-      ! presence.nil?
+      wait_for_presence
+      true
+    rescue ElementNotPresent
+      false
     end
 
     def not_present?
-      Waiter.wait_for do
-        ! present?
-      end
+      wait_for_absence
+      true
+    rescue ElementNotAbsent
+      false
     end
 
     def presence
-      element
-    rescue AePageObjects::LoadingElementFailed
+      implicit_element
+    rescue LoadingElementFailed
       nil
     end
 
+    def wait_for_presence(timeout = nil)
+      is_present = Waiter.wait_for(timeout) do
+        ! presence.nil?
+      end
+
+      unless is_present
+        raise ElementNotPresent, "element_class: #{@element_class}, options: #{@options.inspect}"
+      end
+    end
+
+    def wait_for_absence(timeout = nil)
+      is_absent = Waiter.wait_for(timeout) do
+        check_absence
+      end
+
+      unless is_absent
+        raise ElementNotAbsent, "element_class: #{@element_class}, options: #{@options.inspect}"
+      end
+    end
+
     def is_a?(type)
       type == @element_class || type == ElementProxy
     end
@@ -61,7 +85,7 @@ module AePageObjects
         return @element_class
       end
 
-      element.__send__(name, *args, &block)
+      implicit_element.__send__(name, *args, &block)
     end
 
     def respond_to?(*args)
@@ -70,8 +94,28 @@ module AePageObjects
 
   private
 
-    def element
-      @element ||= @element_class.new(*@args)
+    def load_element
+      @element_class.new(*@args)
+    end
+
+    def implicit_element
+      @loaded_element ||= load_element
+    end
+
+    def check_absence
+      load_element
+
+      false
+    rescue LoadingElementFailed
+      true
+    rescue => e
+      if Capybara.current_session.driver.is_a?(Capybara::Selenium::Driver) &&
+        e.is_a?(Selenium::WebDriver::Error::StaleElementReferenceError)
+        # ignore and spin around for another check
+        false
+      else
+        raise
+      end
     end
   end
 end

data/lib/ae_page_objects/exceptions.rb

@@ -13,6 +13,12 @@ module AePageObjects
   class LoadingElementFailed < LoadingFailed
   end
 
+  class ElementNotPresent < Error
+  end
+
+  class ElementNotAbsent < Error
+  end
+
   class PathNotResolvable < Error
   end
 
@@ -21,4 +27,7 @@ module AePageObjects
 
   class CastError < Error
   end
+
+  class WindowNotFound < Error
+  end
 end

data/lib/ae_page_objects/multiple_windows/window_handle_manager.rb

@@ -13,6 +13,13 @@ module AePageObjects
         else
           browser.window_handle
         end
+      rescue => e
+        if Capybara.current_session.driver.is_a?(Capybara::Selenium::Driver) &&
+           e.is_a?(Selenium::WebDriver::Error::NoSuchWindowError)
+          raise WindowNotFound
+        end
+
+        raise
       end
 
       def self.switch_to(handle)

data/lib/ae_page_objects/multiple_windows/window_list.rb

@@ -15,14 +15,21 @@ module AePageObjects
 
       def opened
         WindowHandleManager.all.map do |handle|
-          find(handle)
+          window_for(handle)
         end
       end
 
       def current_window
         current_handle = WindowHandleManager.current
 
-        find(current_handle) if current_handle
+        window_for(current_handle) if current_handle
+      rescue WindowNotFound
+        synchronize_windows
+
+        if current_window = @windows[@windows.keys.sort.first]
+          current_window.switch_to
+          current_window
+        end
       end
 
       def close_all
@@ -31,12 +38,22 @@ module AePageObjects
 
     private
 
-      def find(handle)
-        @windows[handle] || create_window(handle)
+      def synchronize_windows
+        existence_unverified_window_handles = @windows.keys
+
+        WindowHandleManager.all.map do |handle|
+          # If it exists in the browser, it's been verified
+          existence_unverified_window_handles.delete(handle)
+        end
+
+        # Remove the windows that no longer exist.
+        existence_unverified_window_handles.each do |non_existing_window_handle|
+          @windows.delete(non_existing_window_handle)
+        end
       end
 
-      def create_window(handle)
-        Window.new(self, handle)
+      def window_for(handle)
+        @windows[handle] ||= Window.new(self, handle)
       end
     end
   end

data/lib/ae_page_objects/node.rb

@@ -26,6 +26,8 @@ module AePageObjects
         class_eval <<-RUBY
           def #{m}(*args, &block)
             node.send(:#{m}, *args, &block)
+          rescue Capybara::ElementNotFound
+            raise AePageObjects::LoadingElementFailed
           end
         RUBY
       end
@@ -51,12 +53,6 @@ module AePageObjects
       def current_url_without_params
         current_url.sub(/\?.*/, '')
       end
-
-      def new_subclass(&block)
-        klass = Class.new(self)
-        klass.class_eval(&block) if block
-        klass
-      end
     end
 
     extend Dsl

data/lib/ae_page_objects/util/waiter.rb

@@ -1,7 +1,7 @@
 module AePageObjects
   module Waiter
-    def self.wait_for(&block)
-      seconds_to_wait = Capybara.default_wait_time
+    def self.wait_for(wait_time = nil, &block)
+      seconds_to_wait = wait_time || Capybara.default_wait_time
       start_time      = Time.now
 
       until result = Capybara.using_wait_time(0, &block)
@@ -17,4 +17,4 @@ module AePageObjects
       result
     end
   end
-end
+end

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.3'
 description: Capybara Page Objects pattern
@@ -85,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Capybara Page Objects pattern