gless 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e8c9d821fa58dbac813938eb4bc0f48df3ac05
-  data.tar.gz: 2a0ed6670fa38288d3fd68c6d80a69771605cab4
+  metadata.gz: e4550c784a5681ac3c6c901717552c84bb73cf65
+  data.tar.gz: adf62a9f927189b9592e29dd0cdbcb6502b01eac
 SHA512:
-  metadata.gz: b0877a55cd0235541a072eb379eecd4a634bb429aab2f433dafd956ab2cd19fc0a5b3d3eee001859144163911425f6ff652c9a2d94fad10a0a3abea639b59fbf
-  data.tar.gz: e41f940f2f3c1840f8850f29ea1c8df39d50ad61dfbe7ad0713a1f2c0b1d289ad297474288f1f89cf4a7c2f49d57e9ad4d2e2639889fbfaf08b7c13e9611f884
+  metadata.gz: a3dfdc73d9389a1ea10cda7e60dbb56bc7c0b67ba5a5c8b5a09153dd555cb9e942d684028209f0630fc45a082ccfca15e13be13471850443822ec21c29d7bbb7
+  data.tar.gz: 279b96b2666264d123100f0d9beccb2261f061afff0b4ecfe43a1a46141c75f5909832c974dede0489b75a7a50d87cf20d719d04e7c82bf24e46dbcef06cc1d5

data/Changelog.txt

@@ -25,3 +25,7 @@
 	 of both extra browser capabilities and tags.  The former is
 	 now under :browser => :extras in the config file, and the
 	 latter under :tag in the config file.
+- 2.1.0: 22 May 2014: Added a "timeout" element to the config.
+- 2.1.1: 31 Jul 2014: Major changes to what happenes when we fail to
+	 arrive at a page; eventually the exception should trickle
+	 up to the user.

data/lib/gless/base_page.rb

@@ -415,17 +415,17 @@ module Gless
               @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: validator element #{x} found."
             else
               # Probably never reached
-              @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: validator element #{x} NOT found."
+              @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: validator element #{x} NOT found."
             end
           rescue Watir::Wait::TimeoutError => e
-            @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: validator element #{x} NOT found."
+            @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: validator element #{x} NOT found."
             all_validate = false
           end
         end
 
         self.class.validator_blocks.each do |x|
           if ! x.call @browser, @session
-            @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: a validator block failed."
+            @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: a validator block failed."
             all_validate = false
           end
         end
@@ -435,13 +435,17 @@ module Gless
             @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: all validator elements found."
             break
           else
-            @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: all validator elements found, but the current URL (#{@browser.url}) doesn't match the expected URL(s) (#{self.class.url_patterns})"
+            @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: all validator elements found, but the current URL (#{@browser.url}) doesn't match the expected URL(s) (#{self.class.url_patterns}); trying again."
           end
         else
-          @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: not all validator elements found, trying again."
+          @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: not all validator elements found, trying again."
         end
       end
 
+      if ! all_validate
+          @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: not all validator elements found, continuing, but this it's unlikely to go well."
+      end
+
       begin
         if respond_to? :has_expected_title?
           has_expected_title?.should be_true
@@ -457,7 +461,7 @@ module Gless
 
         @session.log.debug "In GenericBasePage, for #{self.class.name}, arrived?: completed successfully."
         return true
-      rescue Exception => e
+      rescue StandardError => e
         if @session.get_config :global, :debug
           @session.log.debug "GenericBasePage, for #{self.class.name}, arrived?: something doesn't match (url or title or expected elements), exception information follows, then giving you a debugger"
           @session.log.debug "Gless::BasePage: Had an exception in debug mode: #{e.inspect}"
@@ -465,7 +469,8 @@ module Gless
           @session.log.debug "Gless::BasePage: Had an exception in debug mode: #{e.backtrace.join("\n")}"
           debugger
         else
-          return false
+          @session.log.warn "In GenericBasePage, for #{self.class.name}, arrived?: failed to validate the page."
+          raise e
         end
       end
     end

data/lib/gless/session.rb

@@ -64,7 +64,7 @@ module Gless
       @browser = browser
       @application = application
       @pages = Hash.new
-      @timeout = 30
+      @timeout = config.get_default( 600, :global, :browser, :timeout )
       @acceptable_pages = nil
       @config = config
 
@@ -140,14 +140,6 @@ module Gless
 
         good_page.should be_true, "Current URL is #{@browser.url}, which doesn't match any of the acceptable pages: #{@acceptable_pages}"
 
-        # While this is very thorough, it slows things down quite a
-        # bit, and should mostly be covered by
-        # Gless::WrapWatir#click ; leaving here in case we decide we
-        # need it later.
-        #
-        # log.debug "Session: checking for arrival at #{new_page.class.name}"
-        # new_page.arrived?.should be_true
-
         url=@browser.url
         log.debug "Session: refreshed browser URL: #{url}"
         new_page.match_url(url).should be_true
@@ -386,22 +378,25 @@ module Gless
       log.debug "Session: change_pages: checking to see if we have changed pages: #{@browser.title}, #{@current_page}, #{@acceptable_pages}"
 
       good_page = false
-      error_message = ''
+      error_message = nil
       new_page = nil
+      exceptions = {}
 
       # See if we're on one of the acceptable pages; wait until we
       # are for "timeout" seconds.
-      @timeout.times do
+      start_time = Time.now.to_i
+      while true
         self.log.debug "Session: change_pages: yielding to passed block."
         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}"
+          error_message ||= "Caught UnknownObjectExepction in the block we were passed; are the validators for #{@acceptable_pages} correct?  Are you sure that's the right list of pages?  Here's the exception: #{e.inspect}"
         end
         self.log.debug "Session: change_pages: done yielding to passed block."
 
-        if @acceptable_pages.member?( @current_page )
+        # We're *definitely* staying on the same page; don't do any
+        # more work to check where we are
+        if @acceptable_pages.member?( @current_page ) and @acceptable_pages.length == 1
           good_page = true
           new_page = @current_page
           break
@@ -421,27 +416,20 @@ module Gless
 
           @acceptable_pages.each do |page|
             log.debug "Session: change_pages: Checking our current url, #{url}, for a match in #{page.name}: #{@pages[page].match_url(url)}"
-            if @pages[page].match_url(url) and @pages[page].arrived? == true
-              clear_cache
-              good_page    = true
-              @current_page = page
-              new_page = @pages[page]
-              log.debug "Session: change_pages: we seem to be on #{page.name} at #{url}"
-            end
-          end
-
-          if new_page
-            if not new_page.match_url(url)
-              good_page = false
-              error_message = "Current URL is #{url}, which doesn't match that expected for any of the acceptable pages: #{@acceptable_pages}"
-              next
-            end
-
-            log.debug "Session: change_pages: checking for arrival at #{new_page.class.name}"
-            if not new_page.arrived?
-              good_page = false
-              error_message = "The current page, at #{url}, doesn't have all of the elements for any of the acceptable pages: #{@acceptable_pages}"
-              next
+            begin
+              if @pages[page].match_url(url) and @pages[page].arrived? == true
+                clear_cache
+                good_page    = true
+                @current_page = page
+                new_page = @pages[page]
+                log.debug "Session: change_pages: we seem to be on #{page.name} at #{url}"
+
+                break
+              end
+            rescue StandardError => e
+              # Catching exceptions from "arrived?"; in this case we don't
+              # care until later
+              exceptions[page.name] = e.inspect
             end
           end
 
@@ -451,15 +439,19 @@ module Gless
             sleep 1
           end
         end
+
+        if (Time.now.to_i - start_time) > @timeout
+          break
+        end
       end
 
       if good_page
-        log.info "Session: change_pages: We have successfully moved to page #{new_page.class.name}"
+        log.info "Session: change_pages: We have successfully moved to page #{new_page.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?"
+        error_message ||= "Session: change_pages: attempt to change pages to #{click_destination} timed out after #{@timeout} seconds, more or less.  If the clicked element exists, are the validators for #{@acceptable_pages} correct?  Here are the exceptions from each page we tried: #{YAML.dump(exceptions)}"
       end
 
       return good_page, error_message

data/lib/gless/wrap_watir.rb

@@ -415,7 +415,8 @@ module Gless
 
       if @click_destination && change_pages
         @session.log.debug "WrapWatir: #{@name}.click_once: changing pages"
-        @session.change_pages @click_destination, &block
+        change_pages_out, change_pages_message = @session.change_pages @click_destination, &block
+        change_pages_out.should be_true, change_pages_message
       end
     end
 

data/lib/gless.rb

@@ -6,7 +6,7 @@
 # project.
 module Gless
   # The current version number.
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 
   # 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: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Robin Lee Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec