eyes_selenium 1.21.0 → 1.22.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjJjMzY0ZjBhZDViOGY0ZDExODA1Nzg5ZjBlZmJjMjNkM2ZkYjg2OQ==
+    M2JiODEyMDY5YjIyZTdhOGQ1MGE1NTdhOTU1MTQ5YjBkY2UyYzUyOQ==
   data.tar.gz: !binary |-
-    MGQ5M2JmZjI0MWM2MWRmNGFmYzAzZWIxOTIzNzAyMmQzZGQxOWYxMg==
+    NmNhYWJiMzQ1ODhkZGY4ZDUzMGZmOGMxN2RhNWJjMDIxNGI1ZTkzYg==
 SHA512:
   metadata.gz: !binary |-
-    NzgwN2YyZDI2NzFkYWYwNWExMWNhODVlYTYxYTVmZDhmYjU0ZTJkM2M1YTkx
-    ZWIzZWRlYzJiY2ZjM2UxMjExNGMyNTU5NDU4YWU3NmE3ZThiMTY0NmQyZDE1
-    NzY3MTk1N2FiN2E0OWFiY2IyY2UxNzEyZDhlNjRkYTQyNTVjNzA=
+    YjYxZTY2NGM2ZThkNWQ3ODlkOWM3MjgxMzdmYzE2NDkyNzA5YjQ4ZGIwNzI3
+    NDA5MWFmZTUxZWZjMjM2NTM0ZDlhNWYzZWI5MDA2YTI2ZmIxNDdkNTNjZWMw
+    ZGY1NGQ0NzQwYWZlNDRkYjQzOGViMWZhYTM1ZmQzM2RmYTlkZTI=
   data.tar.gz: !binary |-
-    OTU3YTNmMzE5YjhiMGE2ZjA3Y2Y0YjZjNDExNTY0NTk4MzMxNzdlZWQyNjJm
-    YzNjZTJkNDZmYzcxNGExZmMxZjcyMmQ2NWJlYThlMGU4ODljNmQzODA5M2Nj
-    ZmM5MDFkZjU5MTE2MWQwNDZjYzM1NzIxOTdhM2E4NGFjY2Q2ZmQ=
+    MWI1ZTc5ZTA2NDI3MWU1NjMwYTJhOGQ2MjEyNWYyZGQ5YjM5ODdlYWUwMjY5
+    ZDczOWUxOTA3NjMyNTFjNzkxYmFlYTNiOWY2MmU5MDMxMzMwMjFmNDM2YjQ3
+    OWZmMzdiOTI4MTE5NTRjODYyMzk5OWIwN2JiNWNkMjY0YmU2ODQ=

data/lib/eyes_selenium/eyes/driver.rb

@@ -21,6 +21,7 @@ class  Applitools::Driver
     @remote_server_url = address_of_remote_server
     @remote_session_id = remote_session_id
     begin
+      #noinspection RubyResolve
       if driver.capabilities.takes_screenshot?
        @screenshot_taker = false
       else
@@ -71,7 +72,7 @@ class  Applitools::Driver
   end
 
   def user_agent
-    execute_script "return navigator.userAgent"
+    execute_script 'return navigator.userAgent'
   rescue => e
     puts "getUserAgent(): Failed to obtain user-agent string (#{e.message})"
   end
@@ -79,11 +80,13 @@ class  Applitools::Driver
   private
 
     def address_of_remote_server
-      uri = URI(driver.current_url)
-      raise Applitools::EyesError.new("Failed to get remote web driver url") if uri.to_s.empty?
+      # The driver's url is not available using a standard interface, so we use reflection to get it.
+      #noinspection RubyResolve
+      uri = URI(driver.instance_eval{@bridge}.instance_eval{@http}.instance_eval{@server_url})
+      raise Applitools::EyesError.new('Failed to get remote web driver url') if uri.to_s.empty?
 
       webdriver_host = uri.host
-      if ['127.0.0.1', 'localhost'].include?(webdriver_host) && !firefox? && !ie?
+      if %w[127.0.0.1 localhost].include?(webdriver_host) && !firefox? && !ie?
         uri.host = get_local_ip || 'localhost'
       end
 

data/lib/eyes_selenium/eyes/eyes.rb

@@ -18,7 +18,8 @@ class Applitools::Eyes
 
   private
   attr_reader :agent_connector
-  attr_accessor :session, :session_start_info, :match_window_task, :should_match_window_run_once_on_timeout
+  attr_accessor :session, :session_start_info, :match_window_task, :should_match_window_run_once_on_timeout,
+                :dont_get_title
 
   public
   attr_reader :disabled, :app_name, :test_name, :is_open, :viewport_size, :failure_reports, :match_level, :driver
@@ -33,6 +34,17 @@ class Applitools::Eyes
     self.class.api_key
   end
 
+  def title
+    unless dont_get_title
+      begin
+       return driver.title
+      rescue
+        self.dont_get_title = true
+      end
+    end
+    ''
+  end
+
   def initialize(params={})
 
     @disabled = params[:disabled]
@@ -51,6 +63,7 @@ class Applitools::Eyes
     @failure_reports = Applitools::FailureReports::ON_CLOSE
     @save_new_tests = true
     @save_failed_tests = false
+    @dont_get_title = false
   end
 
   def open(params={})
@@ -87,12 +100,12 @@ class Applitools::Eyes
     user_inputs.clear
   end
 
-  def check_window(tag)
+  def check_window(tag=nil)
     return if disabled?
     raise Applitools::EyesError.new('Eyes not open') if !open?
     unless session
       start_session
-      self.match_window_task = Applitools::MatchWindowTask.new(agent_connector, session, driver, match_timeout)
+      self.match_window_task = Applitools::MatchWindowTask.new(self, agent_connector, session, driver, match_timeout)
     end
 
     as_expected = match_window_task.match_window(tag, should_match_window_run_once_on_timeout)
@@ -154,7 +167,8 @@ class Applitools::Eyes
   #      get "http://www.google.com"
   #      check_window("initial")
   #    end
-  def test(params={})
+  #noinspection RubyUnusedLocalVariable
+  def test(params={}, &block)
     begin
       open(params)
       yield(driver)

data/lib/eyes_selenium/eyes/match_window_task.rb

@@ -3,13 +3,16 @@ require 'base64'
 
 class Applitools::MatchWindowTask
 
+  private
   MATCH_INTERVAL = 0.5
   AppOutput = Struct.new(:title, :screenshot64)
 
-  attr_reader :agent_connector, :session, :driver, :max_window_load_time
+  attr_reader :eyes, :agent_connector, :session, :driver, :max_window_load_time
 
+  public
   ## max_load_time: maximum wait time for check window, in seconds
-  def initialize(agent_connector, session, driver, max_window_load_time)
+  def initialize(eyes, agent_connector, session, driver, max_window_load_time)
+    @eyes = eyes
     @agent_connector = agent_connector
     @session = session
     @driver = driver
@@ -26,7 +29,7 @@ class Applitools::MatchWindowTask
     else
       run_with_intervals(tag, max_window_load_time)
     end
-
+    #noinspection RubyUnnecessaryReturnStatement
     driver.eyes.clear_user_inputs and return res
   end
 
@@ -51,7 +54,7 @@ class Applitools::MatchWindowTask
   private
 
     def prep_match_data(tag, ignore_mismatch)
-      title = driver.title
+      title = eyes.title
       current_screenshot_encoded = Base64.decode64(driver.screenshot_as(:base64))
       @current_screenshot = ChunkyPNG::Image.from_blob(current_screenshot_encoded)
       compressed_screenshot = Applitools::Utils::ImageDeltaCompressor.compress_by_raw_blocks(@current_screenshot,
@@ -83,7 +86,6 @@ class Applitools::MatchWindowTask
           end
         end
       end
-
       Applitools::MatchWindowData.new(app_output, user_inputs, tag, ignore_mismatch, compressed_screenshot)
     end
 
@@ -91,9 +93,9 @@ class Applitools::MatchWindowTask
       data = prep_match_data(tag, ignore_mismatch)
       as_expected = agent_connector.match_window(session, data)
       # If the server stored this image, it will be used as a base for our next screenshot compression
-      if !ignore_mismatch
+      unless ignore_mismatch
         @last_checked_window = @current_screenshot
       end
-      return as_expected
+      as_expected
     end
 end

data/lib/eyes_selenium/eyes/screenshot_taker.rb

@@ -12,7 +12,7 @@ class Applitools::ScreenshotTaker
   end
 
   def screenshot
-    res = self.class.get(driver_server_uri.gsub(/\/$/,"") + "/session/#{driver_session_id}/screenshot").to_s
+    res = self.class.get(driver_server_uri.to_s.gsub(/\/$/,"") + "/session/#{driver_session_id}/screenshot")
     res.parsed_response['value']
   end
 end

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '1.21.0'
+  VERSION = '1.22.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver