eyes_core 3.17.20 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9021f863033d0281a19a728b8e87cd2ed2fd18f744cdfb83a46b809b93310308
-  data.tar.gz: 2ee948f59938c28802e9995187422f201fab370c7cba7ed7587969a1726f8f80
+SHA1:
+  metadata.gz: 61b34e0cc3a83b84a7a4a2c9548eb55ad10c8b4a
+  data.tar.gz: f017a2093422378561cd8d3236fe696816129a80
 SHA512:
-  metadata.gz: 9de5d764bdaba7da5cf84f6955227a9b9d58c2619eea05845a703ba29886236c9b24a0cbae0890de66aeb9cbc51b8591aa00241a018eabe228f592f77a881daf
-  data.tar.gz: bd3910030429066bb90503fe9f07799179a95587864ecf81118eb7fd59e7fa80087bf4ec22c10f903da247c2f617ad5b00b43d3003fd4a843913927b7bef14c5
+  metadata.gz: bd0fced9b70f0a10375e81dbbde7ae75cd8f0ee8f7969a176f0156a9c5323e21bb337a0d2a0eb43bd607c4af82a15ee12d8dd79e70d8965099a821fdb69ac980
+  data.tar.gz: 6a6fef3ccba6a3df74c7a0cd35886036442df8a4b1d365c13cb1a9d05eccd1efc3497653e18fdd3e49d54735472bc9e26a3718757c1ab8677fa61f3628c45ad0

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.17.20
+  version: 3.18.1
 platform: ruby
 authors:
 - Applitools Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2021-04-28 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