ae_page_objects 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1496697b39e5a7662d536eda0f8ca5fef935b6b7
-  data.tar.gz: 18b7a97561c00230d65f3e5a9c2ab540e5c9dc6d
+  metadata.gz: bccdd111c15cbfc24c720ab0ecb2df6615d817af
+  data.tar.gz: 640432edfc7bae3b61ab33c37cb878344a6fdb66
 SHA512:
-  metadata.gz: 6ec2500cc1c2ded7fa193dabd15f3e3813a427b459508d1732ba182f29ec39fb8e4b530abd96ea89d94875c156ab67c68fb53431fcbe34fbbeb2e2fef780c831
-  data.tar.gz: cb79d33d0817bfede524f924a1ccb660cf22b6f124d9dc96bccb2755d445a96311f4aa7e1792293e44c7d066d3e76a591f10a8ff62c39e4045ba213021b07309
+  metadata.gz: 9eccb45c332ac93f9b87c04065d834595d864b5eab6116d8d9cb469fac270a134baf4671c2c2087f7b1df6de22907807d93bad6347cef0e6758d3c293ca72adc
+  data.tar.gz: 9782f24bbc2f0eea7fdf7e9cef46b4bc2554ab15ed7c578aa247b55b8f4d1a0e6333c194e960672cede92e4f46ececea2d590ee97dd6414e80c12daa337c75f8

data/lib/ae_page_objects/concerns/visitable.rb

@@ -9,7 +9,7 @@ module AePageObjects
     private
 
       def ensure_loaded!
-        unless Waiter.wait_for { self.class.can_load_from_current_url? }
+        unless Waiter.wait_until { self.class.can_load_from_current_url? }
           raise LoadingPageFailed, "#{self.class.name} cannot be loaded with url '#{current_url_without_params}'"
         end
 

data/lib/ae_page_objects/core/dsl.rb

@@ -38,8 +38,8 @@ module AePageObjects
     #
     #     collection :addresses
     #
-    #   Collection class: ::AePageObjects::Collection
-    #   Item class:       ::AePageObjects::Element
+    #   Collection class: Collection
+    #   Item class:       Element
     #
     # ------------------------------------------------
     # Signature: (no :is, no :contains, block)
@@ -49,18 +49,18 @@ module AePageObjects
     #       element :state
     #     end
     #
-    #   Collection class: one-off subclass of ::AePageObjects::Collection
-    #   Item class:       one-off subclass of ::AePageObjects::Element
+    #   Collection class: one-off subclass of Collection
+    #   Item class:       one-off subclass of Element
     #   Methods defined on item class:
-    #     city()  # -> instance of ::AePageObjects::Element
-    #     state() # -> instance of ::AePageObjects::Element
+    #     city()  # -> instance of Element
+    #     state() # -> instance of Element
     #
     # ------------------------------------------------
     # Signature: (no :is, :contains, no block)
     #
     #     collection :addresses, :contains => Address
     #
-    #   Collection class: one-off subclass of ::AePageObjects::Collection
+    #   Collection class: one-off subclass of Collection
     #   Item class:       Address
     #
     # ------------------------------------------------
@@ -71,11 +71,11 @@ module AePageObjects
     #     element :latitude
     #   end
     #
-    #   Collection class: one-off subclass of ::AePageObjects::Collection  element
+    #   Collection class: one-off subclass of Collection  element
     #   Item class:       one-off subclass of Address
     #   Methods defined on item class:
-    #     longitude()  # -> instance of ::AePageObjects::Element
-    #     latitude() # -> instance of ::AePageObjects::Element
+    #     longitude()  # -> instance of Element
+    #     latitude() # -> instance of Element
     #
     # ------------------------------------------------
     # Signature: (:is, no :contains, no block)
@@ -96,8 +96,8 @@ module AePageObjects
     #   Collection class: one-off subclass of AddressList
     #   Item class:       one-off subclass of AddressList.item_class
     #   Methods defined on item class:
-    #     longitude()  # -> instance of ::AePageObjects::Element
-    #     latitude() # -> instance of ::AePageObjects::Element
+    #     longitude()  # -> instance of Element
+    #     latitude() # -> instance of Element
     #
     # ------------------------------------------------
     # Signature: (:is, :contains, no block)
@@ -118,8 +118,8 @@ module AePageObjects
     #   Collection class: one-off subclass of AddressList
     #   Item class:       one-off subclass of Address
     #   Methods defined on item class:
-    #     longitude()  # -> instance of ::AePageObjects::Element
-    #     latitude() # -> instance of ::AePageObjects::Element
+    #     longitude()  # -> instance of Element
+    #     latitude() # -> instance of Element
     #
     def collection(name, options = {}, &block)
       options ||= {}
@@ -136,9 +136,9 @@ module AePageObjects
 
       # create/get the collection class
       if options[:is]
-        ensure_class_for_param!(:is, options[:is], ::AePageObjects::Collection)
+        ensure_class_for_param!(:is, options[:is], Collection)
       else
-        options[:is] = ::AePageObjects::Collection
+        options[:is] = Collection
       end
 
       item_class = options.delete(:contains) || options[:is].item_class
@@ -162,7 +162,7 @@ module AePageObjects
       raise ArgumentError, ":is option not supported" if options[:is]
       raise ArgumentError, "Block required." if block.nil?
 
-      klass = Class.new(::AePageObjects::Form, &block)
+      klass = Class.new(Form, &block)
 
       options      = options.dup
       options[:is] = klass
@@ -183,7 +183,7 @@ module AePageObjects
   private
 
     def field_klass(options, &block)
-      klass = options.delete(:is) || ::AePageObjects::Element
+      klass = options.delete(:is) || Element
 
       if block_given?
         Class.new(klass, &block)

data/lib/ae_page_objects/core/site.rb

@@ -26,7 +26,7 @@ module AePageObjects
 
       def from(from_mod)
         until from_mod == Object
-          if from_mod < AePageObjects::Universe
+          if from_mod < Universe
             return from_mod.page_objects_site_class.instance
           end
 

data/lib/ae_page_objects/document.rb

@@ -22,7 +22,7 @@ module AePageObjects
     class << self
     private
       def site
-        @site ||= AePageObjects::Site.from(self)
+        @site ||= Site.from(self)
       end
     end
   end

data/lib/ae_page_objects/document_loader.rb

@@ -6,7 +6,7 @@ module AePageObjects
     end
 
     def load
-      Waiter.wait_for do
+      Waiter.wait_until do
         @query.conditions.each do |document_condition|
           if document = @strategy.load_document_with_condition(document_condition)
             return document

data/lib/ae_page_objects/element.rb

@@ -20,7 +20,7 @@ module AePageObjects
       @document ||= begin
         node = self.parent
 
-        until node.is_a?(::AePageObjects::Document)
+        until node.is_a?(Document)
           node = node.parent
         end
 

data/lib/ae_page_objects/element_proxy.rb

@@ -16,44 +16,72 @@ module AePageObjects
       @loaded_element = nil
     end
 
-    # Provided so that visible? can be asked without
-    # an explicit check for present? first.
     def visible?
-      Waiter.wait_for do
-        inst = presence
-        !! inst && inst.visible?
-      end
+      wait_until_visible
+      true
+    rescue ElementNotVisible
+      false
+    end
+
+    def hidden?
+      wait_until_hidden
+      true
+    rescue ElementNotHidden
+      false
     end
 
     def not_visible?
-      Waiter.wait_for do
-        inst = presence
-        inst.nil? || ! inst.visible?
-      end
+      hidden?
     end
 
     def present?
-      wait_for_presence
+      wait_until_present
       true
     rescue ElementNotPresent
       false
     end
 
-    def not_present?
-      wait_for_absence
+    def absent?
+      wait_until_absent
       true
     rescue ElementNotAbsent
       false
     end
 
+    def not_present?
+      absent?
+    end
+
     def presence
       implicit_element
     rescue LoadingElementFailed
       nil
     end
 
-    def wait_for_presence(timeout = nil)
-      is_present = Waiter.wait_for(timeout) do
+    def wait_until_visible(timeout = nil)
+      is_visible = Waiter.wait_until(timeout) do
+        inst = presence
+        ! inst.nil? && inst.visible?
+      end
+
+      unless is_visible
+        raise ElementNotVisible, "element_class: #{@element_class}, options: #{@options.inspect}"
+      end
+    end
+
+    def wait_until_hidden(timeout = nil)
+      is_hidden = Waiter.wait_until(timeout) do
+        inst = presence
+        inst.nil? || ! inst.visible?
+      end
+
+      unless is_hidden
+        raise ElementNotHidden, "element_class: #{@element_class}, options: #{@options.inspect}"
+      end
+    end
+
+    def wait_until_present(timeout = nil)
+      is_present = Waiter.wait_until(timeout) do
         ! presence.nil?
       end
 
@@ -62,8 +90,12 @@ module AePageObjects
       end
     end
 
-    def wait_for_absence(timeout = nil)
-      is_absent = Waiter.wait_for(timeout) do
+    def wait_for_presence(timeout = nil)
+      wait_until_present(timeout)
+    end
+
+    def wait_until_absent(timeout = nil)
+      is_absent = Waiter.wait_until(timeout) do
         check_absence
       end
 
@@ -72,6 +104,10 @@ module AePageObjects
       end
     end
 
+    def wait_for_absence(timeout = nil)
+      wait_until_absent(timeout)
+    end
+
     def is_a?(type)
       type == @element_class || type == ElementProxy
     end

data/lib/ae_page_objects/exceptions.rb

@@ -13,10 +13,19 @@ module AePageObjects
   class LoadingElementFailed < LoadingFailed
   end
 
-  class ElementNotPresent < Error
+  class ElementExpectationError < Error
   end
 
-  class ElementNotAbsent < Error
+  class ElementNotVisible < ElementExpectationError
+  end
+
+  class ElementNotHidden < ElementExpectationError
+  end
+
+  class ElementNotPresent < ElementExpectationError
+  end
+
+  class ElementNotAbsent < ElementExpectationError
   end
 
   class PathNotResolvable < Error
@@ -30,4 +39,7 @@ module AePageObjects
 
   class WindowNotFound < Error
   end
+
+  class WaitTimeoutError < Error
+  end
 end

data/lib/ae_page_objects/node.rb

@@ -26,8 +26,8 @@ module AePageObjects
         class_eval <<-RUBY
           def #{m}(*args, &block)
             node.send(:#{m}, *args, &block)
-          rescue Capybara::ElementNotFound
-            raise AePageObjects::LoadingElementFailed
+          rescue Capybara::ElementNotFound => e
+            raise LoadingElementFailed, e.message
           end
         RUBY
       end

data/lib/ae_page_objects/single_window/same_window_loader_strategy.rb

@@ -19,13 +19,13 @@ module AePageObjects
 
       def load_document(document_class)
         document_class.new
-      rescue AePageObjects::LoadingPageFailed
+      rescue LoadingPageFailed
         nil
       end
 
       def condition_matches?(document, condition)
         condition.match?(document)
-      rescue AePageObjects::LoadingElementFailed
+      rescue ElementExpectationError, LoadingElementFailed
         false
       end
     end

data/lib/ae_page_objects/util/waiter.rb

@@ -1,7 +1,7 @@
 module AePageObjects
   module Waiter
-    def self.wait_for(wait_time = nil, &block)
-      seconds_to_wait = wait_time || Capybara.default_wait_time
+    def self.wait_until(timeout = nil, &block)
+      seconds_to_wait = timeout || Capybara.default_wait_time
       start_time      = Time.now
 
       until result = Capybara.using_wait_time(0, &block)
@@ -16,5 +16,21 @@ module AePageObjects
 
       result
     end
+
+    def self.wait_for(*args, &block)
+      wait_until(*args, &block)
+    end
+
+    def self.wait_until!(timeout = nil)
+      result = wait_until(timeout) do
+        yield
+      end
+
+      unless result
+        raise WaitTimeoutError, "Timed out waiting for condition"
+      end
+
+      result
+    end
   end
 end

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara