eyes_core 3.17.21 → 3.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5f5de232cfebace23a11b460e49b9d345bace6aaae97c3348694f7ae55bb94a5
-  data.tar.gz: 95e1815deed07620bcaec68b0de6e2938b7c6d8b87aafb8b5f0e16abfbe247bf
+SHA1:
+  metadata.gz: 36a1a5082471151d4ccbc5683bc06802ae56b776
+  data.tar.gz: 1574274f76f4e4eaa271c70308592d3324856d2c
 SHA512:
-  metadata.gz: e1bc1a7f731af8f0e78164246e039dac0967adc00c66dc343a51c15e3355ca826874b534ab77ba16e1eb6dad159cb026536c7ded50c9405a008c6b499710614a
-  data.tar.gz: 9e848677e2e2a2edda3e6ecd45ff4421a9dc6f0c4706982cd9f103e07efd6f228b66acdbf31a5dbb9fffeef4e9f234b9c7a738a4901c735477006d8db9601c6a
+  metadata.gz: 62858147e7ee749c0dfdbb3dfdb992d3ecd8ec7f4269f789a9d71fae9ad007802cd31401382bb08e37b35375f3b532406d6cb9729fb412c2cdadaeba1db8e194
+  data.tar.gz: 6681412cf7e58b2e9a3e824ed82bc3dcf1bb1ef1f36e7d045076b8068c1f674614205305c7dbf67875965dee7a21071fa86f7ce8fda102699f64f075eaffb93a

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/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

@@ -118,6 +118,7 @@ module Applitools
     object_field :accessibility_validation, Applitools::AccessibilitySettings, true
     object_field :properties, Array
     int_field :match_timeout
+    string_field :agent_run_id
 
     methods_to_delegate.delete(:batch_info)
     methods_to_delegate.delete(:batch_info=)

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.21'.freeze
+  VERSION = '3.18.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.17.21
+  version: 3.18.2
 platform: ruby
 authors:
 - Applitools Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2021-05-05 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
@@ -373,7 +371,7 @@ licenses:
 - Applitools
 metadata:
   yard.run: yri
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -389,8 +387,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14.3
+signing_key: 
 specification_version: 4
 summary: Core of the Applitools Ruby SDK
 test_files: []

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