eyes_selenium 1.39.0 → 1.40.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ0YzQzZGMwZGY2Mjc1YjI3Mjk5YWMxNjc3NGU4ODFiNTQ0NmZlZg==
+    ZGIwYmU3YzViYzJmNWI2Mzg3NzFjZWZiYjg5OTIzMDE2NTQwODYyZQ==
   data.tar.gz: !binary |-
-    ZTU4ZjBkM2U2Y2Q4ZWE5YzhhNTQ4NDA5MmQyOWJhOTdlY2U4ZTNlMA==
+    NzdkZDQxZTEzMDFlYTc5YWI5Mzg3Yzk0NmNjZDYyMzhlNDlmOThkZA==
 SHA512:
   metadata.gz: !binary |-
-    YzNlZGUzZjBlNDc1NGU1ZjliMDEyMDBmMzViNjE5NWMxZjZkODBhNmUxNmE1
-    NWUwZTNiMmFiN2U5NTkyMmNiZDExNmZmY2FiYWMwZDg5MzA4ZDAyYzEzNTBm
-    Mjk4Mjg2NDAzMzVjODE0ZmEyYWMxMDQwNTc2NDFjZjU5NDljNTM=
+    YjA0ZTVmNzI2NjNlZjQ4Yzk1NmE0ZWJkYjUxMTM0OWY3NzcyYzRkZjg2YTVi
+    ODA4ZDFkNzQ2MDQ3NTMzZThmYjkyMGJmOGIwNzQxZTA5ODMxNWQyZWM1ZmRl
+    Mjk4OGI1NWI1NDYyY2U0NjM3OWEwNDJiOTViM2EyYjQ0N2E3YTE=
   data.tar.gz: !binary |-
-    N2FmMTdjNjNmNTQwMWU1ZjI3ZTJhMmJlMjVhYmZkMTllNDU1ZjUzYmE5MjNh
-    MDFiYjM5ZDhjOTg4OGY2ZjE5ZWI4ODg5ZmNmYjY2MzJiNTVjZTEzMTE2MGQ0
-    N2M0NmVmN2I3YzhlODU3MGUxMTEyMDA5N2NiNGQyMmI5ODhkODM=
+    ZmY1NzY2MGViNGUwMGZmY2EwMDQ4NzM1YTZhODMyOThjM2UxY2JjOTkwMGI0
+    NjMwNGQ0N2Q2MDc2MjJkNGIyYjljYWY2YWVkMGFjNTUyZWIyNThhMDU5MjBi
+    MDVlN2U0YmI4ZTM4YWU1YmQ4Yzk0ZTQ3ZDYwNTg1YWQ2NGQwYWE=

data/lib/eyes_selenium/eyes/eyes.rb

@@ -99,7 +99,7 @@ class Applitools::Eyes
     user_inputs.clear
   end
 
-  def check_region(how, what, tag=nil)
+  def check_region(how, what, tag=nil, specific_timeout=-1)
     return if disabled?
     # We have to start the session if it's not started, since we want the viewport size to be set before getting the
     # element's position and size
@@ -113,11 +113,11 @@ class Applitools::Eyes
     location = element_to_check.location
     size = element_to_check.size
     region = Applitools::Region.new(location.x, location.y, size.width, size.height)
-    check_region_(region, tag)
+    check_region_(region, tag, specific_timeout)
   end
 
-  def check_window(tag=nil)
-    check_region_(Applitools::Region::EMPTY, tag)
+  def check_window(tag=nil, specific_timeout=-1)
+    check_region_(Applitools::Region::EMPTY, tag, specific_timeout)
   end
 
   def close(raise_ex=true)
@@ -265,8 +265,9 @@ class Applitools::Eyes
       end
     end
 
-  def check_region_(region, tag=nil)
+  def check_region_(region, tag=nil, specific_timeout=-1)
     return if disabled?
+    EyesLogger.info "check_region('#{tag}', #{specific_timeout})"
     raise Applitools::EyesError.new('region cannot be nil!') if region.nil?
     raise Applitools::EyesError.new('Eyes not open') if !open?
 
@@ -275,11 +276,11 @@ class Applitools::Eyes
       self.match_window_task = Applitools::MatchWindowTask.new(self, agent_connector, session, driver, match_timeout)
     end
 
-    as_expected = match_window_task.match_window(region, tag, should_match_window_run_once_on_timeout)
+    as_expected = match_window_task.match_window(region, specific_timeout, tag, should_match_window_run_once_on_timeout)
     unless as_expected
       self.should_match_window_run_once_on_timeout = true
       unless session.new_session?
-        EyesLogger.info %( "mismatch #{ tag ? '' : "(#{tag})" } )
+        EyesLogger.info %( mismatch #{ tag ? '' : "(#{tag})" } )
         if failure_reports.to_i == Applitools::FailureReports::IMMEDIATE
           raise Applitools::TestFailedError.new("Mismatch found in '#{session_start_info.scenario_id_or_name}'"\
                                                 " of '#{session_start_info.app_id_or_name}'")

data/lib/eyes_selenium/eyes/match_window_task.rb

@@ -7,29 +7,36 @@ class Applitools::MatchWindowTask
   MATCH_INTERVAL = 0.5
   AppOutput = Struct.new(:title, :screenshot64)
 
-  attr_reader :eyes, :agent_connector, :session, :driver, :max_window_load_time, :last_checked_window ,:last_screenshot_bounds
+  attr_reader :eyes, :agent_connector, :session, :driver, :default_retry_timeout, :last_checked_window ,:last_screenshot_bounds
 
   public
-  ## max_load_time: maximum wait time for check window, in seconds
-  def initialize(eyes, agent_connector, session, driver, max_window_load_time)
+  #noinspection RubyParameterNamingConvention
+  def initialize(eyes, agent_connector, session, driver, default_retry_timeout)
     @eyes = eyes
     @agent_connector = agent_connector
     @session = session
     @driver = driver
-    @max_window_load_time = max_window_load_time
+    @default_retry_timeout = default_retry_timeout
     @last_checked_window = nil # +ChunkyPNG::Canvas+
     @last_screenshot_bounds = Applitools::Region::EMPTY # +Applitools::Region+
     @current_screenshot = nil # +ChunkyPNG::Canvas+
   end
 
-  def match_window(region, tag,run_once_after_wait=false)
-    res = if max_window_load_time.zero?
+  def match_window(region, retry_timeout, tag,run_once_after_wait=false)
+    if retry_timeout < 0
+      retry_timeout = default_retry_timeout
+    end
+    EyesLogger.debug "Retry timeout set to: #{retry_timeout}"
+    start = Time.now
+    res = if retry_timeout.zero?
             run(region, tag)
           elsif run_once_after_wait
-            run(region, tag, max_window_load_time)
+            run(region, tag, retry_timeout)
           else
-            run_with_intervals(region, tag, max_window_load_time)
+            run_with_intervals(region, tag, retry_timeout)
           end
+    elapsed_time = Time.now - start
+    EyesLogger.debug "match_window(): Completed in #{format('%.2f', elapsed_time)} seconds"
     @last_checked_window = @current_screenshot
     @last_screenshot_bounds = region.empty? ? Applitools::Region.new(0, 0, last_checked_window.width, last_checked_window.height) : region
     #noinspection RubyUnnecessaryReturnStatement
@@ -37,20 +44,33 @@ class Applitools::MatchWindowTask
   end
 
   def run(region, tag, wait_before_run=nil)
+    EyesLogger.debug "Trying matching once..."
     sleep(wait_before_run) if wait_before_run
     match(region, tag)
   end
 
-  def run_with_intervals(region, tag, total_run_time)
+  def run_with_intervals(region, tag, retry_timeout)
+    # We intentionally take the first screenshot before starting the timer, to allow the page
+    # just a tad more time to stabilize.
+    EyesLogger.debug 'Matching with interval...'
+    data = prep_match_data(region, tag, true)
     start = Time.now
-    match_retry = total_run_time
-    while match_retry > 0
+    as_expected = agent_connector.match_window(session, data)
+    EyesLogger.debug "First call result: #{as_expected}"
+    return true if as_expected
+    match_retry = Time.now - start
+    while match_retry < retry_timeout
       sleep(MATCH_INTERVAL)
+      EyesLogger.debug 'Matching...'
       return true if match(region, tag, true)
-      match_retry -= (Time.now - start)
+      match_retry = Time.now - start
+      EyesLogger.debug "Elapsed time: #{match_retry}"
     end
     ## lets try one more time if we still don't have a match
-    match(region, tag)
+    EyesLogger.debug 'Last attempt to match...'
+    as_expected = match(region, tag)
+    EyesLogger.debug "Match result: #{as_expected}"
+    as_expected
   end
 
   private

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '1.39.0'
+  VERSION = '1.40.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 1.39.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver