eyes_core 3.16.15 → 3.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00bd1d272774a42a3cd33cebe385b3aa9a6e53cdb627f625f4503d7950fa822
-  data.tar.gz: 6f7396c9774c8332c926dce7f62f0ba9573ad920294589af3c435a6588c3dc54
+  metadata.gz: c787872bfae6a5ebff57943e35298ec87694ddb2c981da7269d153c0070feab9
+  data.tar.gz: 3879aa521a421e7ad6ad454de14ded53873bf04fe931dcf5088c143e564a22cf
 SHA512:
-  metadata.gz: 7a78447c0ca43e4e3905fd0ef3068dc754461283a2defa0551c5fdef9583e8d3f783904acb4c35c86fc31878e190bf2b3929dd536369de1ba455283966ff1256
-  data.tar.gz: 4a854afdcf564e0aca48cace6f77368ac315730659d2e85b871bddfd290eaff665c3226f3e6f558dff384c8de5d7c5ff088c98203c6e0e8e81f7b560571d3951
+  metadata.gz: f75c0d8811e9d2dfe57af4e4c43122dc0f501db4fbf14024218fd2c8c0c5d6e654953c17b57d66913ce4eb7255ad73bdd74bc432c8de8233f20caccd6e553b63
+  data.tar.gz: cab966515a359bdccbb8e42dd43195624e9bd96ecc376ee29b3fddf17e5ed8520201b5a53221ed0dd8de7dc73c38418fdc4022ca2f8edc54dc0809f757c3eb46

data/lib/applitools/appium/android_screenshot.rb

@@ -0,0 +1,21 @@
+require_relative './screenshot.rb'
+module Applitools
+  module Appium
+    class AndroidScreenshot < Applitools::Appium::Screenshot
+      def convert_region_location(region, from, to)
+        # converted_size = region.size.dup.scale_it!(1 / device_pixel_ratio)
+        # converted_location = region.location.dup.offset_negative(Applitools::Location.new(0, status_bar_height)).scale_it!(1 / device_pixel_ratio)
+        # Applitools::Region.from_location_size(converted_location, converted_size)
+        Applitools::Region.from_location_size(
+          convert_location(region.location, nil, nil),
+          region.size
+        ).scale_it!(1.to_f / device_pixel_ratio)
+      end
+
+      def convert_location(location, _from, _to)
+        location.offset_negative(Applitools::Location.new(0, status_bar_height))
+      end
+
+    end
+  end
+end

data/lib/applitools/appium/driver.rb

@@ -2,10 +2,11 @@
 
 module Applitools::Appium
   class Driver < Applitools::Selenium::Driver
-    attr_accessor :appium_driver
     def initialize(eyes, options)
-      self.appium_driver = options.delete(:appium_driver)
       super(eyes, options)
     end
+    module AppiumLib
+      extend self
+    end
   end
 end

data/lib/applitools/appium/eyes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 
 class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
+  attr_accessor :status_bar_height
   def perform_driver_settings_for_appium_driver
     self.region_visibility_strategy = Applitools::Selenium::NopRegionVisibilityStrategy.new
     self.force_driver_resolution_as_viewport_size = true
@@ -11,6 +12,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
     self.dont_get_title = true
     self.runner = Applitools::ClassicRunner.new
     self.base_agent_id = "eyes.appium.ruby/#{Applitools::VERSION}".freeze
+    self.status_bar_height = 0
   end
 
   private :perform_driver_settings_for_appium_driver
@@ -76,7 +78,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
     result = super do |screenshot|
       if scale_provider
         scaled_image = scale_provider.scale_image(screenshot.image)
-        self.screenshot = Applitools::Appium::Screenshot.new(
+        self.screenshot = screenshot_class.new(
           Applitools::Screenshot.from_image(
             case scaled_image
             when ChunkyPNG::Image
@@ -86,7 +88,9 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
             else
               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)
         )
       end
     end
@@ -115,17 +119,22 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
 
   def viewport_screenshot
     logger.info 'Viewport screenshot requested...'
-    self.screenshot = Applitools::Appium::Screenshot.new(
+
+    self.screenshot = screenshot_class.new(
       Applitools::Screenshot.from_datastream(driver.screenshot_as(:png))
     )
   end
 
   def element_screenshot
     logger.info 'Element screenshot requested...'
-    self.screenshot = Applitools::Appium::Screenshot.new(
-      Applitools::Screenshot.from_datastream(
-        driver.element_screenshot_as(eyes_element_to_check, :png)
-      )
+    self.screenshot = screenshot_class.new(
+      Applitools::Screenshot.from_datastream(driver.element_screenshot_as(eyes_element_to_check, :png))
     )
   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)
+    raise Applitools::EyesError, 'Unknown device type'
+  end
 end

data/lib/applitools/appium/ios_screenshot.rb

@@ -0,0 +1,10 @@
+require_relative './screenshot.rb'
+module Applitools
+  module Appium
+    class IosScreenshot < Applitools::Appium::Screenshot
+      def convert_location(location, _from, _to)
+        location.offset_negative(Applitools::Location.new(0, status_bar_height))
+      end
+    end
+  end
+end

data/lib/applitools/appium/screenshot.rb

@@ -3,6 +3,16 @@
 module Applitools
   module Appium
     class Screenshot < Applitools::EyesScreenshot
+
+      attr_reader :status_bar_height, :device_pixel_ratio
+
+      def initialize(*args)
+        options = Applitools::Utils.extract_options!(args)
+        @status_bar_height = options[:status_bar_height] || 0
+        @device_pixel_ratio = options[:device_pixel_ratio] || 1
+        super
+      end
+
       def sub_screenshot(region, _coordinate_type, _throw_if_clipped = false, _force_nil_if_clipped = false)
         self.class.new(
           Applitools::Screenshot.from_image(
@@ -10,6 +20,11 @@ module Applitools
           )
         )
       end
+
+      def convert_location(location, _from, _to)
+        raise 'Applitools::Appium::Screenshot is an abstract class.' \
+          ' You should implement :convert_location method in a descendant class.'
+      end
     end
   end
 end

data/lib/applitools/appium/target.rb

@@ -4,8 +4,7 @@ module Applitools
   module Appium
     class Target
       include Applitools::FluentInterface
-
-      attr_accessor :region_to_check, :options
+      attr_accessor :region_to_check, :options, :ignored_regions, :floating_regions, :layout_regions, :content_regions, :strict_regions, :accessibility_regions
 
       class << self
         def window
@@ -19,6 +18,12 @@ module Applitools
 
       def initialize
         self.region_to_check = proc { Applitools::Region::EMPTY }
+        self.ignored_regions = []
+        self.floating_regions = []
+        self.layout_regions = []
+        self.content_regions = []
+        self.strict_regions = []
+        self.accessibility_regions = []
         self.options = {}
       end
 
@@ -34,9 +39,170 @@ module Applitools
         self
       end
 
+      def ignore(*args)
+        requested_padding = if args.last.is_a? Applitools::PaddingBounds
+                              args.pop
+                            else
+                              Applitools::PaddingBounds::ZERO_PADDING
+                            end
+        ignored_regions <<  case (first_argument = args.first)
+                            when ::Selenium::WebDriver::Element
+                              proc do
+                                Applitools::Region
+                                  .from_location_size(first_argument.location, first_argument.size)
+                                  .padding(requested_padding)
+                              end
+                            when Applitools::Region
+                              result = first_argument.padding(requested_padding)
+                              if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                                def result.converted?
+                                  true
+                                end
+                              end
+                              result
+                            else
+                              proc do |driver|
+                                element = driver.find_element(*args)
+                                Applitools::Region
+                                  .from_location_size(element.location, element.size)
+                                  .padding(requested_padding)
+                              end
+                            end
+        self
+      end
+
+      def floating(*args)
+        value = case args.first
+                when Applitools::FloatingRegion
+                  args.first
+                when Applitools::Region
+                  result = Applitools::FloatingRegion.any(*args)
+                  if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                    def result.converted?
+                      true
+                    end
+                  end
+                  result
+                when ::Selenium::WebDriver::Element
+                  args_dup = args.dup
+                  Applitools::FloatingRegion.any(*args_dup)
+                else
+                  proc do |driver|
+                    args_dup = args.dup
+                    region = driver.find_element(args_dup.shift, args_dup.shift)
+                    Applitools::FloatingRegion.any(
+                        region, *args_dup
+                    )
+                  end
+                end
+        floating_regions << value
+        self
+      end
+
+      def layout
+        return match_level(Applitools::MatchLevel::LAYOUT) if args.empty?
+        region = process_region(*args)
+        layout_regions << region
+      self
+
+      end
+
+      def content(*args)
+        return match_level(Applitools::MatchLevel::CONTENT) if args.empty?
+        region = process_region(*args)
+        content_regions << region
+        self
+      end
+
+      def strict(*args)
+        return match_level(Applitools::MatchLevel::STRICT) if args.empty?
+        region = process_region(*args)
+        strict_regions << region
+        self
+      end
+
+      def exact(*args)
+        match_level(Applitools::MatchLevel::EXACT, *args)
+      end
+
+      def accessibility(*args)
+        options = Applitools::Utils.extract_options! args
+        unless options[:type]
+          raise Applitools::EyesError,
+                'You should call Target.accessibility(region, type: type). The region_type option is required'
+        end
+        unless Applitools::AccessibilityRegionType.enum_values.include?(options[:type])
+          raise Applitools::EyesIllegalArgument,
+                "The region type should be one of [#{Applitools::AccessibilityRegionType.enum_values.join(', ')}]"
+        end
+
+        accessibility_regions << case args.first
+                                 when ::Selenium::WebDriver::Element
+                                   element = args.first
+                                   Applitools::AccessibilityRegion.new(
+                                     element,
+                                     options[:type]
+                                   )
+                                 when Applitools::Region
+                                   result = Applitools::AccessibilityRegion.new(
+                                       args.first, options[:type]
+                                   )
+                                   if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+                                     def result.converted?
+                                       true
+                                     end
+                                   end
+                                   result
+                                 when String
+                                   proc do |driver|
+                                     element = driver.find_element(name_or_id: args.first)
+                                     Applitools::AccessibilityRegion.new(
+                                       element,
+                                       options[:type]
+                                     )
+                                   end
+                                 else
+                                   proc do |driver|
+                                     elements = driver.find_elements(*args)
+                                     elements.map do |e|
+                                       Applitools::AccessibilityRegion.new(
+                                         e,
+                                         options[:type]
+                                       )
+                                     end
+                                   end
+                                 end
+        self
+      end
+
       def finalize
         self
       end
+
+      private
+
+      def process_region(*args)
+        r = args.first
+        case r
+        when ::Selenium::WebDriver::Element
+          proc do |driver|
+            Applitools::Region.from_location_size(r.location, r.size)
+          end
+        when Applitools::Region
+          if Applitools::Utils::EyesSeleniumUtils.ios?(Applitools::Appium::Driver::AppiumLib)
+            def r.converted?
+              true
+            end
+          end
+          r
+        else
+          proc do |driver|
+            element = driver.find_element(*args)
+            Applitools::Region.from_location_size(element.location, element.size)
+          end
+        end
+      end
+
     end
   end
 end

data/lib/applitools/appium/utils.rb

@@ -4,7 +4,9 @@ module Applitools::Appium
   module Utils
     # true if test is running on mobile device
     def mobile_device?(driver)
-      defined?(Appium::Driver) && driver.respond_to?(:appium_driver) && driver.appium_driver
+      defined?(Appium::Driver) &&
+          defined?(Applitools::Appium::Driver::AppiumLib) &&
+          Applitools::Appium::Driver::AppiumLib
     end
 
     # true if test is running on Android device
@@ -19,18 +21,26 @@ module Applitools::Appium
 
     # @param [Applitools::Selenium::Driver] driver
     def platform_version(driver)
-      driver.respond_to?(:caps) && driver.caps[:platformVersion]
+      driver.respond_to?(:platform_version) && driver.platform_version
     end
 
     # @param [Applitools::Selenium::Driver] executor
     def device_pixel_ratio(executor)
-      if executor.respond_to? :session_capabilities
-        session_info = executor.session_capabilities
-        return session_info['pixelRatio'].to_f if session_info['pixelRatio']
-      end
+      session_info = session_capabilities(executor)
+      return session_info['pixelRatio'].to_f if session_info['pixelRatio']
       Applitools::Selenium::Eyes::UNKNOWN_DEVICE_PIXEL_RATIO
     end
 
+    def status_bar_height(executor)
+      session_info = session_capabilities(executor)
+      return session_info['statBarHeight'].to_i if session_info['statBarHeight']
+      0
+    end
+
+    def session_capabilities(executor)
+       executor.session_capabilities if executor.respond_to? :session_capabilities
+    end
+
     def current_scroll_position(driver)
       super
     rescue

data/lib/applitools/connectivity/server_connector.rb

@@ -279,9 +279,7 @@ module Applitools::Connectivity
     end
 
     def start_session(session_start_info)
-      request_body = Oj.dump(
-        startInfo: Applitools::Utils.camelcase_hash_keys(session_start_info.to_hash)
-      )
+      request_body = session_start_info.json
       res = long_post(
         endpoint_url, body: request_body
       )

data/lib/applitools/core/abstract_configuration.rb

@@ -11,9 +11,11 @@ module Applitools
     def initialize
       @config_hash = {}
       self.validation_errors = {}
-      default_config = self.class.default_config
-      default_config.keys.each do |k|
-        send "#{k}=", default_config[k]
+      if self.class.respond_to? :default_config
+        default_config = self.class.default_config
+        default_config.keys.each do |k|
+          send "#{k}=", default_config[k]
+        end
       end
     end
 

data/lib/applitools/core/accessibility_level.rb

@@ -3,12 +3,44 @@
 module Applitools
   module AccessibilityLevel
     extend self
-    NONE = 'None'
     AA = 'AA'
     AAA = 'AAA'
 
     def enum_values
-      [NONE, AA, AAA]
+      [AA, AAA]
+    end
+  end
+
+  module AccessibilityGuidelinesVersion
+    extend self
+    WCAG_2_1 = 'WCAG_2_1'
+    WCAG_2_0 = 'WCAG_2_0'
+    def enum_values
+      [WCAG_2_0, WCAG_2_1]
+    end
+  end
+
+  class AccessibilitySettings
+    attr_reader :config_hash
+    attr_accessor :validation_errors
+    extend Applitools::EyesConfigurationDSL
+
+    enum_field :level, Applitools::AccessibilityLevel.enum_values
+    enum_field :version, Applitools::AccessibilityGuidelinesVersion.enum_values
+
+    def initialize(accessibility_level, guidelines_version)
+      @config_hash = {}
+      self.validation_errors = []
+      self.level = accessibility_level
+      self.version = guidelines_version
+    end
+
+    def to_h
+      @config_hash
+    end
+
+    def json_data
+      to_h
     end
   end
 end

data/lib/applitools/core/accessibility_region_type.rb

@@ -4,7 +4,6 @@ module Applitools
   module AccessibilityRegionType
     extend self
 
-    NONE = 'None'
     IGNORE_CONTRAST = 'IgnoreContrast'
     REGULAR_TEXT = 'RegularText'
     LARGE_TEXT = 'LargeText'
@@ -13,7 +12,6 @@ module Applitools
 
     def enum_values
       [
-        NONE,
         IGNORE_CONTRAST,
         REGULAR_TEXT,
         LARGE_TEXT,

data/lib/applitools/core/app_environment.rb

@@ -12,16 +12,20 @@ module Applitools
       self.device_info = options[:device_info]
     end
 
-    def to_hash
+    def json_data
       {
-        'os' => os,
-        'hostingApp' => hosting_app,
-        'displaySize' => display_size && display_size.to_hash,
-        'inferred' => inferred_environment,
-        'deviceInfo' => device_info.nil? || device_info.empty? ? 'Desktop' : device_info + ' (Chrome emulation)'
+          'os' => os,
+          'hostingApp' => hosting_app,
+          'displaySize' => display_size && display_size.to_hash,
+          'inferred' => inferred_environment,
+          'deviceInfo' => device_info.nil? || device_info.empty? ? 'Desktop' : device_info
       }
     end
 
+    def to_hash
+      json_data
+    end
+
     def to_s
       result = ''
       to_hash.each_pair do |k, v|

data/lib/applitools/core/batch_info.rb

@@ -19,16 +19,20 @@ module Applitools
       self.id = SecureRandom.uuid unless id
     end
 
-    def to_hash
+    def json_data
       {
-        'id' => id,
-        'name' => name,
-        'startedAt' => @started_at.iso8601,
-        'batchSequenceName' => sequence_name,
-        'notifyOnCompletion' => 'true'.casecmp(notify_on_completion || '') == 0 ? true : false
+          'id' => id,
+          'name' => name,
+          'startedAt' => @started_at.iso8601,
+          'batchSequenceName' => sequence_name,
+          'notifyOnCompletion' => 'true'.casecmp(notify_on_completion || '') == 0 ? true : false
       }
     end
 
+    def to_hash
+      json_data
+    end
+
     def to_s
       to_hash.to_s
     end

data/lib/applitools/core/eyes_base.rb

@@ -87,7 +87,6 @@ module Applitools
       self.results = []
       self.allow_empty_screenshot = true
       @inferred_environment = nil
-      @properties = []
       @server_scale = 0
       @server_remainder = 0
       get_app_output_method = ->(r, s) { get_app_output_with_screenshot r, s }
@@ -151,10 +150,6 @@ module Applitools
       running_session && running_session.new_session?
     end
 
-    def add_property(name, value)
-      @properties << { name: name, value: value }
-    end
-
     def abort_if_not_closed
       if disabled?
         logger.info "#{__method__} Ignored"
@@ -319,11 +314,14 @@ module Applitools
 
       tag = '' if tag.nil?
 
-      session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
-         scenario_id_or_name: test_name, batch_info: batch,
-         env_name: baseline_env_name, environment: app_environment,
-         default_match_settings: default_match_settings.json_data,
-         branch_name: branch_name, parent_branch_name: parent_branch_name, properties: properties
+      self.session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
+                                                     scenario_id_or_name: test_name, batch_info: batch,
+                                                     baseline_env_name: baseline_env_name, environment: app_env,
+                                                     default_match_settings: default_match_settings,
+                                                     environment_name: environment_name, session_type: session_type,
+                                                     branch_name: branch_name, parent_branch_name: parent_branch_name,
+                                                     baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
+                                                     properties: properties
 
       match_window_data.start_info = session_start_info
       match_window_data.update_baseline_if_new = save_new_tests
@@ -481,7 +479,7 @@ module Applitools
     attr_accessor :running_session, :last_screenshot, :scale_provider, :session_start_info,
       :should_match_window_run_once_on_timeout, :app_output_provider, :failed
 
-    attr_reader :user_inputs, :properties
+    attr_reader :user_inputs
 
     private :full_agent_id, :full_agent_id=
 
@@ -596,9 +594,11 @@ module Applitools
 
       self.session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
                                                 scenario_id_or_name: test_name, batch_info: batch,
-                                                env_name: baseline_env_name, environment: app_env,
-                                                default_match_settings: default_match_settings.json_data,
+                                                baseline_env_name: baseline_env_name, environment: app_env,
+                                                default_match_settings: default_match_settings,
+                                                environment_name: environment_name, session_type: session_type,
                                                 branch_name: branch_name, parent_branch_name: parent_branch_name,
+                                                baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
                                                 properties: properties
 
       logger.info 'Starting server session...'

data/lib/applitools/core/eyes_base_configuration.rb

@@ -20,7 +20,9 @@ module Applitools
         ENV['bamboo_APPLITOOLS_SERVER_URL'] || Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL,
       api_key: ENV['APPLITOOLS_API_KEY'] || ENV['bamboo_APPLITOOLS_API_KEY'] || '',
       save_new_tests: true,
-      default_match_settings: Applitools::ImageMatchSettings.new
+      default_match_settings: Applitools::ImageMatchSettings.new,
+      accessibility_validation: nil,
+      properties: []
     }.freeze
 
     class << self
@@ -109,6 +111,8 @@ module Applitools
     int_field :scale
     int_field :remainder
     boolean_field :ignore_caret
+    object_field :accessibility_validation, Applitools::AccessibilitySettings, true
+    object_field :properties, Array
 
     methods_to_delegate.delete(:batch_info)
     methods_to_delegate.delete(:batch_info=)
@@ -161,6 +165,16 @@ module Applitools
       default_match_settings.ignore_caret = value
     end
 
+    def custom_setter_for_accessibility_validation(value)
+      # self.default_match_settings = self.parent.class.default_config[:default_match_settings] unless default_match_settings
+      default_match_settings.accessibility_validation = value
+    end
+
+    def add_property(name, value)
+      properties << { name: name, value: value } if name && value
+    end
+
     methods_to_delegate.push(:set_proxy)
+    methods_to_delegate.push(:add_property)
   end
 end

data/lib/applitools/core/eyes_configuration_dsl.rb

@@ -62,7 +62,7 @@ module Applitools
       end
     end
 
-    def object_field(field_name, klass)
+    def object_field(field_name, klass, allow_nil = false)
       collect_method field_name
       define_method(field_name) do
         return send("custom_getter_for_#{field_name}", config_hash[field_name.to_sym]) if
@@ -71,11 +71,11 @@ module Applitools
       end
       define_method("#{field_name}=") do |*args|
         value = args.shift
-        unless value.is_a? klass
+        unless value.is_a?(klass)
           raise(
             Applitools::EyesIllegalArgument,
             "Expected #{klass} but got #{value.class}"
-          )
+          ) unless allow_nil && value.nil?
         end
         config_hash[field_name.to_sym] = value
         config_hash[field_name.to_sym] = send("custom_setter_for_#{field_name}", config_hash[field_name.to_sym]) if
@@ -123,7 +123,7 @@ module Applitools
         unless available_values_array.include? value
           raise(
             Applitools::EyesIllegalArgument,
-            "Unknown #{field_name} #{value}. Allowed session types: " \
+            "Unknown #{field_name} #{value}. Allowed #{field_name} values: " \
            "#{available_values_array.join(', ')}"
           )
         end

data/lib/applitools/core/image_match_settings.rb

@@ -6,12 +6,12 @@ module Applitools
   class ImageMatchSettings
     include Applitools::Jsonable
     include Applitools::MatchLevelSetter
-    json_fields :accessibilityLevel, :MatchLevel, :IgnoreCaret, :IgnoreDisplacements, :Accessibility,
+    json_fields :accessibilitySettings, :MatchLevel, :IgnoreCaret, :IgnoreDisplacements, :Accessibility,
       :Ignore, :Floating, :Layout, :Strict, :Content, :Exact, :EnablePatterns, :UseDom,
       :SplitTopHeight, :SplitBottomHeight, :scale, :remainder
 
     def initialize
-      self.accessibility_level = 'None'
+      self.accessibility_settings = nil
       self.match_level = Applitools::MatchLevel::STRICT
       self.split_top_height = 0
       self.split_bottom_height = 0
@@ -49,6 +49,15 @@ module Applitools
       cloned_value
     end
 
+    def accessibility_validation
+      accessibility_settings
+    end
+
+    def accessibility_validation=(value)
+      raise Applitools::EyesIllegalArgument, "Expected value to be an Applitools::AccessibilitySettings instance but got #{value.class}" unless value.nil? || value.is_a?(Applitools::AccessibilitySettings)
+      self.accessibility_settings = value
+    end
+
     class Exact
       include Applitools::Jsonable
       json_fields :MinDiffIntensity, :MinDiffWidth, :MinDiffHeight, :MatchThreshold

data/lib/applitools/core/jsonable.rb

@@ -7,9 +7,10 @@ module Applitools
       base.extend ClassMethods
       base.class_eval do
         class << self
-          attr_accessor :json_methods
+          attr_accessor :json_methods, :wrap_data_block
         end
         @json_methods = {}
+        @wrap_data_block = nil
       end
     end
 
@@ -34,10 +35,16 @@ module Applitools
       def json_fields(*args)
         args.each { |m| json_field m }
       end
+
+      def wrap_data(&block)
+        @wrap_data_block = block
+      end
     end
 
     def json_data
-      self.class.json_methods.sort.map { |k, v| [k, json_value(send(v))] }.to_h
+      result = self.class.json_methods.sort.map { |k, v| [k, json_value(send(v))] }.to_h
+      result = self.class.wrap_data_block.call(result) if self.class.wrap_data_block.is_a? Proc
+      result
     end
 
     def json

data/lib/applitools/core/match_window_data.rb

@@ -4,6 +4,7 @@ module Applitools
   class MatchWindowData
     class << self
       def convert_coordinates(region, screenshot)
+        return region.with_padding.to_hash if region.respond_to?(:converted?) && region.converted?
         screenshot.convert_region_location(
           region.with_padding,
           Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative],

data/lib/applitools/core/session_start_info.rb

@@ -2,38 +2,36 @@
 
 module Applitools
   class SessionStartInfo
-    attr_accessor :app_id_or_name, :scenario_id_or_name
+    include Applitools::Jsonable
+    json_fields :batchInfo, :agentId, :appIdOrName, :verId, :environment, :environmentName, :branchName, :defaultMatchSettings,
+      :scenarioIdOrName, :properties, :parentBranchName, :compareWithParentBranch, :baselineEnvName, :saveDiffs, :sessionType,
+      :baselineBranchName
+
+    wrap_data do |value|
+      { startInfo: value }
+    end
 
     def initialize(options = {})
-      @agent_id = options[:agent_id]
-      @app_id_or_name = options[:app_id_or_name]
-      @ver_id = options[:ver_id]
-      @scenario_id_or_name = options[:scenario_id_or_name]
-      @batch_info = options[:batch_info]
-      @env_name = options[:env_name]
-      @environment = options[:environment]
-      @default_match_settings = options[:default_match_settings]
-      @branch_name = options[:branch_name]
-      @parent_branch_name = options[:parent_branch_name]
-      @properties = options[:properties]
-      @compare_with_parent_branch = options[:compare_with_parent_branch]
+      self.agent_id = options[:agent_id]
+      self.app_id_or_name = options[:app_id_or_name]
+      self.ver_id = options[:ver_id]
+      self.scenario_id_or_name = options[:scenario_id_or_name]
+      self.batch_info = options[:batch_info]
+      self.environment_name = options[:environment_name]
+      self.baseline_env_name = options[:baseline_env_name]
+      self.environment = options[:environment]
+      self.default_match_settings = options[:default_match_settings]
+      self.branch_name = options[:branch_name]
+      self.parent_branch_name = options[:parent_branch_name]
+      self.properties = options[:properties]
+      self.compare_with_parent_branch = options[:compare_with_parent_branch]
+      self.save_diffs = options[:save_diffs]
+      self.session_type = options[:session_type]
+      self.baseline_branch_name = options[:baseline_branch_name]
     end
 
     def to_hash
-      {
-        agent_id: @agent_id,
-        app_id_or_name: @app_id_or_name,
-        ver_id: @ver_id,
-        scenario_id_or_name: @scenario_id_or_name,
-        batch_info: @batch_info && @batch_info.to_hash,
-        env_name: @env_name,
-        environment: @environment.to_hash,
-        default_match_settings: @default_match_settings,
-        branch_name: @branch_name,
-        parent_branch_name: @parent_branch_name,
-        compare_with_parent_branch: @compare_with_parent_branch,
-        properties: @properties
-      }
+      json_data
     end
   end
 end

data/lib/applitools/core/test_results.rb

@@ -4,6 +4,18 @@ require 'yaml'
 
 module Applitools
   class TestResults
+    class AccessibilityStatus
+      attr_accessor :status, :level, :version
+      def initialize(hash = {})
+        self.status = hash['status']
+        self.level = hash['level']
+        self.version = hash['version']
+      end
+
+      def failed?
+        status.downcase == 'Failed'.downcase
+      end
+    end
     attr_accessor :is_new, :url, :screenshot
     attr_reader :status, :steps, :matches, :mismatches, :missing, :original_results
 
@@ -50,6 +62,14 @@ module Applitools
       original_results['secretToken']
     end
 
+    def name
+      original_results['name']
+    end
+
+    def session_accessibility_status
+      @accessibility_status ||= original_results['accessibilityStatus'] && AccessibilityStatus.new(original_results['accessibilityStatus'] || {})
+    end
+
     def ==(other)
       if other.is_a? self.class
         result = true

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.16.15
+  version: 3.17.3
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -260,10 +260,12 @@ files:
 - ext/eyes_core/extconf.rb
 - ext/eyes_core/eyes_core.c
 - ext/eyes_core/eyes_core.h
+- 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_screenshot.rb
 - lib/applitools/appium/region_provider.rb
 - lib/applitools/appium/screenshot.rb
 - lib/applitools/appium/target.rb