eyes_core 3.17.22 → 3.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f68b068dd48b9cdae7e9cfc0e46431595ea08f
-  data.tar.gz: ee8077e2cbc57fd1f613b74726af18a4088b23b1
+  metadata.gz: b75c9b6d9f7188f819aa7e2e0402056ef87c2454
+  data.tar.gz: 912b814145c5b47d81bff5424a939806f38dd8cc
 SHA512:
-  metadata.gz: ca66f4e8f3f6743671732d3a7aa5de14c6aa3ce49a2145556ed8c6be925f3365359d7daa9bffeeca4993297459b53cf978b0594ec86102038d5258cfcbb4e2f8
-  data.tar.gz: 7f8464d5f9b98458d5cc99eacf76eeae3c26f73fb22d4ad5b5fac7ceaafc23beb2c8e3c39a163e6919814a51a1e61e9dcfaf9690af2ddaad3fc84d4990c932e9
+  metadata.gz: c87057e3092012f7621acc3a61868bcdde84813f4abdf6af9fdf1f8b0e3855ce60fb458bb89bc6907bb1f6949e4f9a6711ff7f805e2ab88aadd752eca96d384f
+  data.tar.gz: efa26a008603071e3734ad5033f3c20e55927aede90551e12bf68cd846a59608442836c5db3de7ffa96f8590b512912e11c22e04b42355f0e8075cdd6a1796b1

data/lib/applitools/appium/android_region_provider.rb

@@ -12,6 +12,14 @@ module Applitools
 
       def convert_viewport_rect_coordinates
         region  = viewport_rect
+
+        session_info = Applitools::Appium::Utils.session_capabilities(driver)
+        if session_info['deviceScreenSize']
+          device_height = session_info['deviceScreenSize'].split('x').last.to_i
+          system_bars_height = driver.get_system_bars.map {|_,v| v['height'] }.sum
+          region['height'] = device_height - system_bars_height
+        end
+
         Applitools::Region.new(
             region['left'],
             region['top'],

data/lib/applitools/appium/eyes.rb

@@ -14,6 +14,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
     self.runner = Applitools::ClassicRunner.new
     self.base_agent_id = "eyes.appium.ruby/#{Applitools::VERSION}".freeze
     self.status_bar_height = 0
+    self.utils = Applitools::Appium::Utils
   end
 
   private :perform_driver_settings_for_appium_driver
@@ -90,8 +91,8 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
               raise Applitools::EyesError.new('Unknown image format after scale!')
             end
           ),
-          status_bar_height: Applitools::Utils::EyesSeleniumUtils.status_bar_height(driver),
-          device_pixel_ratio: Applitools::Utils::EyesSeleniumUtils.device_pixel_ratio(driver)
+          status_bar_height: self.utils.status_bar_height(driver),
+          device_pixel_ratio: self.utils.device_pixel_ratio(driver)
         )
       end
     end
@@ -131,20 +132,20 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
   def obtain_viewport_screenshot
     self.screenshot = screenshot_class.new(
         Applitools::Screenshot.from_datastream(driver.screenshot_as(:png)),
-        status_bar_height: Applitools::Utils::EyesSeleniumUtils.status_bar_height(driver),
-        device_pixel_ratio: Applitools::Utils::EyesSeleniumUtils.device_pixel_ratio(driver)
+        status_bar_height: self.utils.status_bar_height(driver),
+        device_pixel_ratio: self.utils.device_pixel_ratio(driver)
     )
   end
 
   def screenshot_class
-    return Applitools::Appium::IosScreenshot if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
-    return Applitools::Appium::AndroidScreenshot if Applitools::Utils::EyesSeleniumUtils.android?(Applitools::Appium::Driver::AppiumLib)
+    return Applitools::Appium::IosScreenshot if self.utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    return Applitools::Appium::AndroidScreenshot if self.utils.android?(Applitools::Appium::Driver::AppiumLib)
     raise Applitools::EyesError, 'Unknown device type'
   end
 
   def region_provider_class
-    return Applitools::Appium::IosRegionProvider if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
-    return Applitools::Appium::AndroidRegionProvider if Applitools::Utils::EyesSeleniumUtils.android?(Applitools::Appium::Driver::AppiumLib)
+    return Applitools::Appium::IosRegionProvider if self.utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    return Applitools::Appium::AndroidRegionProvider if self.utils.android?(Applitools::Appium::Driver::AppiumLib)
     raise Applitools::EyesError, 'Unknown device type'
   end
 end

data/lib/applitools/appium/region_provider.rb

@@ -23,7 +23,7 @@ module Applitools
       private
 
       def viewport_rect
-        Applitools::Utils::EyesSeleniumUtils.viewport_rect(driver)
+        Applitools::Appium::Utils.viewport_rect(driver)
       end
 
       def convert_region_coordinates
@@ -44,7 +44,7 @@ module Applitools
       end
 
       def scale_factor
-        Applitools::Utils::EyesSeleniumUtils.device_pixel_ratio(driver)
+        Applitools::Appium::Utils.device_pixel_ratio(driver)
       end
     end
   end

data/lib/applitools/appium/target.rb

@@ -54,7 +54,7 @@ module Applitools
                               end
                             when Applitools::Region
                               result = first_argument.padding(requested_padding)
-                              if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                              if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
                                 def result.converted?
                                   true
                                 end
@@ -77,7 +77,7 @@ module Applitools
                   args.first
                 when Applitools::Region
                   result = Applitools::FloatingRegion.any(*args)
-                  if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                  if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
                     def result.converted?
                       true
                     end
@@ -147,7 +147,7 @@ module Applitools
                                    result = Applitools::AccessibilityRegion.new(
                                        args.first, options[:type]
                                    )
-                                   if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                                   if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
                                      def result.converted?
                                        true
                                      end
@@ -189,7 +189,7 @@ module Applitools
             Applitools::Region.from_location_size(r.location, r.size)
           end
         when Applitools::Region
-          if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+          if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
             def r.converted?
               true
             end

data/lib/applitools/appium/utils.rb

@@ -2,6 +2,9 @@
 
 module Applitools::Appium
   module Utils
+    include Applitools::Utils::EyesSeleniumUtils
+    extend self
+
     # true if test is running on mobile device
     def mobile_device?(driver)
       defined?(Appium::Driver) &&

data/lib/applitools/connectivity/server_connector.rb

@@ -167,7 +167,7 @@ module Applitools::Connectivity
       Oj.load(response.body)
     end
 
-    def download_resource(url, ua_string = nil)
+    def download_resource(url, ua_string = nil, cookies=nil)
       Applitools::EyesLogger.debug "Fetching #{url}..."
       resp_proc = proc do |u|
         faraday_connection(u, false).send(:get) do |req|
@@ -175,6 +175,7 @@ module Applitools::Connectivity
           req.headers[:accept_encoding] = 'identity'
           req.headers[:accept_language] = '*'
           req.headers[:user_agent] = ua_string if ua_string
+          req.headers[:Cookie] = cookies.map { |h| [h[:name], h[:value]].join('=') }.join('; ') unless cookies.to_a.empty?
         end
       end
       response = resp_proc.call(url)

data/lib/applitools/core/batch_info.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'securerandom'
+require 'applitools/utils/utils'
 require_relative 'helpers'
 
 module Applitools
   class BatchInfo
     extend Helpers
-    attr_accessor :started_at, :id, :notify_on_completion
+    attr_accessor :started_at, :id, :notify_on_completion, :properties
 
     environment_attribute :name, 'APPLITOOLS_BATCH_NAME'
     environment_attribute :id, 'APPLITOOLS_BATCH_ID'
@@ -14,10 +15,24 @@ module Applitools
     environment_attribute :env_notify_on_completion, 'APPLITOOLS_BATCH_NOTIFY'
 
 
-    def initialize(name = nil, started_at = Time.now)
+    def initialize(args = nil, started_at = Time.now)
+      case args
+        when String
+          name = args
+        when Hash
+          sym_args = Applitools::Utils.symbolize_keys args
+          id ||= sym_args[:id]
+          name ||= sym_args[:name]
+          properties ||= sym_args[:properties]
+      end
       self.name = name if name
       @started_at = started_at
-      self.id = SecureRandom.uuid unless id
+      if id
+        self.id = id
+      elsif self.id.nil? || self.id.empty?
+        self.id = SecureRandom.uuid
+      end
+      self.properties = properties if properties
       self.notify_on_completion = 'true'.casecmp(env_notify_on_completion || '') == 0 ? true : false
     end
 
@@ -27,7 +42,8 @@ module Applitools
           'name' => name,
           'startedAt' => @started_at.iso8601,
           'batchSequenceName' => sequence_name,
-          'notifyOnCompletion' => notify_on_completion
+          'notifyOnCompletion' => notify_on_completion,
+          'properties' => properties
       }
     end
 

data/lib/applitools/core/eyes_base.rb

@@ -319,7 +319,7 @@ module Applitools
                                                      branch_name: branch_name, parent_branch_name: parent_branch_name,
                                                      baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
                                                      properties: properties
-
+      session_start_info.agent_run_id = agent_run_id if agent_run_id
       match_window_data.start_info = session_start_info
       match_window_data.update_baseline_if_new = save_new_tests
       match_window_data.update_baseline_if_different = save_failed_tests
@@ -597,6 +597,7 @@ module Applitools
                                                 branch_name: branch_name, parent_branch_name: parent_branch_name,
                                                 baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
                                                 properties: properties
+      session_start_info.agent_run_id = agent_run_id if agent_run_id
 
       logger.info 'Starting server session...'
       self.running_session = server_connector.start_session session_start_info

data/lib/applitools/core/eyes_base_configuration.rb

@@ -25,7 +25,10 @@ module Applitools
       default_match_settings: Applitools::ImageMatchSettings.new,
       accessibility_validation: nil,
       properties: [],
-      match_timeout: DEFAULT_MATCH_TIMEOUT
+      match_timeout: DEFAULT_MATCH_TIMEOUT,
+      dont_fetch_resources: true,
+      enable_cross_origin_rendering: true,
+      dont_use_cookies: false,
     }.freeze
 
     class << self
@@ -118,6 +121,10 @@ module Applitools
     object_field :accessibility_validation, Applitools::AccessibilitySettings, true
     object_field :properties, Array
     int_field :match_timeout
+    string_field :agent_run_id
+    boolean_field :dont_fetch_resources
+    boolean_field :enable_cross_origin_rendering
+    boolean_field :dont_use_cookies
 
     methods_to_delegate.delete(:batch_info)
     methods_to_delegate.delete(:batch_info=)
@@ -187,6 +194,10 @@ module Applitools
       properties << { name: name, value: value } if name && value
     end
 
+    def disable_browser_fetching=(value)
+      self.dont_fetch_resources = value
+    end
+
     methods_to_delegate.push(:set_proxy)
     methods_to_delegate.push(:add_property)
   end

data/lib/applitools/core/match_window_data.rb

@@ -87,6 +87,10 @@ module Applitools
       current_data['Options']['Name'] = value
     end
 
+    def variation_group_id=(value)
+      current_data['Options']['variantId'] = value
+    end
+
     def user_inputs=(value)
       Applitools::ArgumentGuard.is_a? value, 'value', Array
       current_data['UserInputs'] += value.select { |i| i.respond_to? :to_hash }

data/lib/applitools/core/session_start_info.rb

@@ -5,7 +5,7 @@ module Applitools
     include Applitools::Jsonable
     json_fields :batchInfo, :agentId, :appIdOrName, :verId, :environment, :environmentName, :branchName, :defaultMatchSettings,
       :scenarioIdOrName, :properties, :parentBranchName, :compareWithParentBranch, :baselineEnvName, :saveDiffs, :sessionType,
-      :baselineBranchName
+      :baselineBranchName, :agentRunId
 
     wrap_data do |value|
       { startInfo: value }
@@ -28,6 +28,7 @@ module Applitools
       self.save_diffs = options[:save_diffs]
       self.session_type = options[:session_type]
       self.baseline_branch_name = options[:baseline_branch_name]
+      self.agentRunId = options[:agent_run_id] if options[:agent_run_id]
     end
 
     def to_hash

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.17.22'.freeze
+  VERSION = '3.18.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.17.22
+  version: 3.18.3
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -264,8 +264,6 @@ files:
 - lib/applitools/appium/android_screenshot.rb
 - lib/applitools/appium/driver.rb
 - lib/applitools/appium/eyes.rb
-- lib/applitools/appium/initialize_1.9.rb
-- lib/applitools/appium/initialize_2.0.rb
 - lib/applitools/appium/ios_region_provider.rb
 - lib/applitools/appium/ios_screenshot.rb
 - lib/applitools/appium/region_provider.rb

data/lib/applitools/appium/initialize_1.9.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-
-module Applitools::Appium
-  module Init19
-    extend self
-
-    def init
-      Applitools::Utils::EyesSeleniumUtils.module_eval do
-        alias_method :super_mobile_device?, :mobile_device?
-        alias_method :super_android?, :android?
-        alias_method :super_ios?, :ios?
-        alias_method :super_platform_version, :platform_version
-        alias_method :super_current_scroll_position, :current_scroll_position
-        include Applitools::Appium::Utils
-      end
-    end
-  end
-end

data/lib/applitools/appium/initialize_2.0.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: false
-
-module Applitools::Appium
-  module Init20
-    extend self
-    def init
-      Applitools::Utils::EyesSeleniumUtils.module_eval do
-        prepend Applitools::Appium::Utils
-        extend self
-      end
-    end
-  end
-end