eyes_selenium 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0e2180f6bc37088d848c7f72d32c7a8f2bf1a5
-  data.tar.gz: f815d843a06af0b271c0a8b8e72c723429ad508b
+  metadata.gz: 4219715fa9dc4e8d577f379654dfb8de47f4b0c3
+  data.tar.gz: be34d6a658b4c2da134940518a56355a4ddd2b2e
 SHA512:
-  metadata.gz: cccd36fb6e9568d7a5f7b594197bf0a591faa404f09454f13c281c625c03f785b4ccb065cd3f2256aeb43ecf2cfc66ec2c69e93c6a3885f61b4b7995c79d8ac1
-  data.tar.gz: 8d4775c59074e78fc8d7f3080cfc5b725f960eb1e66c6a0d1ab6182eb081a52d1acd18b02844d8f70603d99f808d9d960366bb1771fb5b410fe6cc5f02b84ebe
+  metadata.gz: 6c64a2308075fa442cbe9bef45d88b2873b4ea27403cc9daab82c62afcc418b3368a3d379256c0a70aee5bc262f52176428bbe158484e6900b02757d48a400fd
+  data.tar.gz: 7b2b468fe9957dba640ecc54e715f2a3c9f2e7a8f9af40ece6fefe07ae2ffea1bf286fb3677c434695529ca1ac2cbe2a6e48ed5fade55d4a9f1cebce4768e083

data/lib/eyes_selenium/eyes/agent_connector.rb

@@ -25,9 +25,10 @@ class Applitools::AgentConnector
     self.class.headers 'Content-Type' => 'application/octet-stream'
     json_data = data.to_hash.to_json.force_encoding('BINARY') # Notice that this does not include the screenshot
     body = [json_data.length].pack('L>') + json_data + data.screenshot
-
+    EyesLogger.debug 'Sending match data...'
     res = self.class.post(@endpoint_uri + "/#{session.id}", query: {apiKey: api_key}, body: body)
     raise Applitools::EyesError.new('could not connect to server') if res.code != 200
+    EyesLogger.debug "Got response! #{res.parsed_response['asExpected']}"
     res.parsed_response['asExpected']
   end
 

data/lib/eyes_selenium/eyes/eyes.rb

@@ -121,20 +121,30 @@ class Applitools::Eyes
   end
 
   def check_region(how, what, tag=nil, specific_timeout=-1)
+    EyesLogger.debug 'check_region called'
     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
     raise Applitools::EyesError.new('Eyes not open') if !open?
     unless session
+      EyesLogger.debug 'Starting session...'
       start_session
+      EyesLogger.debug 'Done! Creating match window task...'
       self.match_window_task = Applitools::MatchWindowTask.new(self, agent_connector, session, driver, match_timeout)
+      EyesLogger.debug 'Done!'
     end
 
+    EyesLogger.debug 'Finding element...'
     element_to_check = driver.find_element(how, what)
+    EyesLogger.debug 'Done! Getting element location...'
     location = element_to_check.location
+    EyesLogger.debug 'Done! Getting element size...'
     size = element_to_check.size
+    EyesLogger.debug 'Done! Creating region...'
     region = Applitools::Region.new(location.x, location.y, size.width, size.height)
+    EyesLogger.debug 'Done! Checking region...'
     check_region_(region, tag, specific_timeout)
+    EyesLogger.debug 'Done!'
   end
 
   def check_window(tag=nil, specific_timeout=-1)
@@ -288,16 +298,21 @@ class Applitools::Eyes
 
   def check_region_(region, tag=nil, specific_timeout=-1)
     return if disabled?
-    EyesLogger.info "check_region('#{tag}', #{specific_timeout})"
+    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?
 
     unless session
+      EyesLogger.debug 'Starting session...'
       start_session
+      EyesLogger.debug 'Done! Creating match window task...'
       self.match_window_task = Applitools::MatchWindowTask.new(self, agent_connector, session, driver, match_timeout)
+      EyesLogger.debug 'Done!'
     end
 
+    EyesLogger.debug 'Starting match task...'
     as_expected = match_window_task.match_window(region, specific_timeout, tag, should_match_window_run_once_on_timeout)
+    EyesLogger.debug 'Match window done!'
     unless as_expected
       self.should_match_window_run_once_on_timeout = true
       unless session.new_session?

data/lib/eyes_selenium/eyes/match_window_task.rb

@@ -44,24 +44,30 @@ 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
+    EyesLogger.debug 'Trying matching once...'
+    if wait_before_run
+      EyesLogger.debug 'waiting before run...'
+      sleep(wait_before_run)
+      EyesLogger.debug 'waiting done!'
+    end
     match(region, tag)
   end
 
   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...'
+    EyesLogger.debug 'Matching with intervals...'
     data = prep_match_data(region, tag, true)
     start = Time.now
     as_expected = agent_connector.match_window(session, data)
     EyesLogger.debug "First call result: #{as_expected}"
     return true if as_expected
+    EyesLogger.debug "Not as expected, performing retry (total timeout #{retry_timeout})"
     match_retry = Time.now - start
     while match_retry < retry_timeout
+      EyesLogger.debug 'Waiting before match...'
       sleep(MATCH_INTERVAL)
-      EyesLogger.debug 'Matching...'
+      EyesLogger.debug 'Done! Matching...'
       return true if match(region, tag, true)
       match_retry = Time.now - start
       EyesLogger.debug "Elapsed time: #{match_retry}"
@@ -84,25 +90,39 @@ class Applitools::MatchWindowTask
     end
 
     def prep_match_data(region, tag, ignore_mismatch)
+      EyesLogger.debug 'Preparing match data...'
       title = eyes.title
+      EyesLogger.debug 'Getting screenshot...'
+      screenshot64 = driver.screenshot_as(:base64)
+      EyesLogger.debug 'Done! Decoding base64...'
       # 'encoded', as in 'png'.
-      current_screenshot_encoded = Base64.decode64(driver.screenshot_as(:base64))
+      current_screenshot_encoded = Base64.decode64(screenshot64)
+      EyesLogger.debug 'Done! Creating image object from PNG...'
       @current_screenshot = ChunkyPNG::Image.from_blob(current_screenshot_encoded)
+      EyesLogger.debug 'Done!'
       # If a region was defined, we refer to the sub-image defined by the region.
       unless region.empty?
+        EyesLogger.debug 'Calculating clipped region...'
         # If the region is out of bounds, clip it
         clipped_region = get_clipped_region(region, @current_screenshot)
         raise Applitools::EyesError.new("Region is outside the viewport: #{region}") if clipped_region.empty?
+        EyesLogger.debug 'Done! Cropping region...'
         @current_screenshot.crop!(clipped_region.left, clipped_region.top, clipped_region.width, clipped_region.height)
+        EyesLogger.debug 'Done! Creating cropped image object...'
         current_screenshot_encoded = @current_screenshot.to_blob.force_encoding('BINARY')
+        EyesLogger.debug 'Done!'
       end
+      EyesLogger.debug 'Compressing screenshot...'
       compressed_screenshot = Applitools::Utils::ImageDeltaCompressor.compress_by_raw_blocks(@current_screenshot,
                                                                                   current_screenshot_encoded,
                                                                                   last_checked_window)
+      EyesLogger.debug 'Done! Creating AppOuptut...'
       app_output = AppOutput.new(title, nil)
       user_inputs = []
+      EyesLogger.debug 'Handling user inputs...'
       if !last_checked_window.nil?
         driver.eyes.user_inputs.each do |trigger|
+          EyesLogger.debug 'Handling trigger...'
           if trigger.is_a?(Applitools::MouseTrigger)
             updated_trigger = nil
             trigger_left = trigger.control.left + trigger.location.x
@@ -121,6 +141,7 @@ class Applitools::MatchWindowTask
                 updated_control = Applitools::Region.new(control_left, control_top, trigger.control.width, trigger.control.height)
                 updated_trigger = Applitools::MouseTrigger.new(trigger.mouse_action, updated_control, Selenium::WebDriver::Point.new(trigger_left, trigger_top))
               end
+              EyesLogger.debug 'Done with trigger!'
               user_inputs << updated_trigger
             else
               EyesLogger.info "Trigger ignored: #{trigger} (out of bounds)"
@@ -133,6 +154,7 @@ class Applitools::MatchWindowTask
                 control_top = trigger.control.top - last_screenshot_bounds.top
                 updated_control = Applitools::Region.new(control_left, control_top, trigger.control.width, trigger.control.height)
                 updated_trigger = Applitools::TextTrigger.new(trigger.text, updated_control)
+                EyesLogger.debug 'Done with trigger!'
                 user_inputs << updated_trigger
               else 
                 EyesLogger.info "Trigger ignored: #{trigger} (control out of bounds)"
@@ -147,11 +169,17 @@ class Applitools::MatchWindowTask
       else
         EyesLogger.info 'Triggers ignored: no previous window checked'
       end
-      Applitools::MatchWindowData.new(app_output, user_inputs, tag, ignore_mismatch, compressed_screenshot)
+      EyesLogger.debug 'Creating MatchWindowData object..'
+      match_window_data_obj = Applitools::MatchWindowData.new(app_output, user_inputs, tag, ignore_mismatch, compressed_screenshot)
+      EyesLogger.debug 'Done creating MatchWindowData object!'
+      match_window_data_obj
     end
 
     def match(region, tag, ignore_mismatch=false)
+      EyesLogger.debug 'Match called...'
       data = prep_match_data(region, tag, ignore_mismatch)
-      agent_connector.match_window(session, data)
+      match_result = agent_connector.match_window(session, data)
+      EyesLogger.debug 'Match done!'
+      match_result
     end
 end

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver