gless 1.4.2 → 1.5

data/lib/gless/config.rb

@@ -81,6 +81,11 @@ module Gless
       @config.merge!(hash)
     end
 
+    def deep_merge(b)
+      iter = -> a, step {a.merge(step) {|key, oldval, newval| [oldval, newval].all? {|v| v.kind_of? Hash} ? iter.(oldval, newval) : newval}};
+      @config = iter.(@config, b)
+    end
+
     # Set an element in the configuration to the given value, passed after all
     # of the indices.
     #

data/lib/gless/session.rb

@@ -393,7 +393,12 @@ module Gless
       # are for "timeout" seconds.
       @timeout.times do
         self.log.debug "Session: change_pages: yielding to passed block."
-        yield
+        begin
+          yield if block_given?
+        rescue Watir::Exception::UnknownObjectException => e
+          error_message = "Caught UnknownObjectExepction; are the validators for #{@acceptable_pages} correct?  #{e.inspect}"
+          log.warn "Session#change_pages: #{error_message}"
+        end
         self.log.debug "Session: change_pages: done yielding to passed block."
 
         if @acceptable_pages.member?( @current_page )
@@ -452,6 +457,9 @@ module Gless
         log.info "Session: change_pages: We have successfully moved to page #{new_page.class.name}"
 
         @previous_url = url
+      else
+        # Timed out.
+        error_message = "Session: change_pages: attempt to change pages to #{click_destination} timed out after #{@timeout} tries.  If the clicked element exists, are the validators for #{@acceptable_pages} correct?"
       end
 
       return good_page, error_message

data/lib/gless/wrap_watir.rb

@@ -399,7 +399,12 @@ module Gless
     # Unconditionally clicks once, without any error handling; if
     # you want to try to execute a page transition no matter what,
     # just use +click+
-    def click_once
+    #
+    # @param [Boolean] change_pages (false) Call the session object's
+    #   +change_pages+ method if the element targets a page with
+    #   +click_destination+; otherwise, ignore page transitions.  Defaults to
+    #   +false+ simply for backwards-compatibility.
+    def click_once change_pages = false, &block
       elem = find_elem
 
       if @click_destination
@@ -409,8 +414,15 @@ module Gless
       wrapper_logging('click', nil)
       @session.log.debug "WrapWatir: Calling click on a #{elem.class.name} element identified by: #{trimmed_selectors.inspect}"
       elem.click
+
+      if @click_destination && change_pages
+        @session.log.debug "WrapWatir: #{@name}.click_once: changing pages"
+        @session.change_pages @click_destination, &block
+      end
     end
 
+    ClickTriesBeforeWarn = 3
+
     # A wrapper around Watir's click; handles the changing of
     # acceptable pages (i.e. click_destination processing, see
     # {Gless::BasePage} and {Gless::Session} for more details).
@@ -426,10 +438,16 @@ module Gless
       if @click_destination
         @session.log.debug "WrapWatir: click: A #{elem.class.name} element identified by: #{trimmed_selectors.inspect} has a special destination when clicked, #{@click_destination}"
         change_pages_out, change_pages_message = @session.change_pages( @click_destination ) do
+          tries = 0
           wrapper_logging('click', nil)
           @session.log.debug "WrapWatir: click: Calling click on a #{elem.class.name} element identified by: #{trimmed_selectors.inspect}"
           if elem.exists?
             wrap_watir_call :click
+          else
+            tries += 1
+
+            # Warn once.
+            @session.log.warn "WrapWatir#click: element #{@name} doesn't exist; waiting until present." if tries == ClickTriesBeforeWarn
           end
           if block_given?
             yield

data/lib/gless.rb

@@ -6,7 +6,7 @@
 # project.
 module Gless
   # The current version number.
-  VERSION = '1.4.2'
+  VERSION = '1.5'
 
   # Sets up the config, logger and browser instances, the ordering
   # of which is slightly tricky.  If a block is given, the config, after being

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gless
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: '1.5'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec