eyes_appium 3.17.19 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3740c1e6b067739bfb5cf5c71de303f8f5a30df3ffb7de3435779c0248d10dbe
-  data.tar.gz: bd41f67dc6d83f7f50caf79406efa1d9e74ac177105de44e35eb654e9cdbbf46
+SHA1:
+  metadata.gz: a29fb386ed29fe1cc741076cf2a1776ccdd2f292
+  data.tar.gz: ef91a0080d46c352b8f9dadae0570ed094b5eef5
 SHA512:
-  metadata.gz: 4e85e01d071234bd52380fbd19f23557dfef5586b1919ffed9305502fdb83e56a923b4acccd1f1d8526ad0c11cdbeca79ea9227d2497f41efc625c50953164f1
-  data.tar.gz: fcf2b55649040467552c1494eb415df968139e94d41d924c35d50a5dec4ea891dca2a0d20e01a11217865d7e2e65e3d7f16b60e9cea98345c2e78afebf380a46
+  metadata.gz: 3410f82d13de72bc3cd1b9c3a75e4b1574ed81eef44ef9ad4101ee3c645b2fceceece826e0d5ea17f3651c34239a946f2a3f5f9d668fb31bb4ff42c483c940b1
+  data.tar.gz: d1c59ee3ead4ef1c143b362b7dca857279d34fabe33fa8413bd2360531f8c45d10fdccbf4a35c409c6b39fbb106b23f58a110b6eda41fef4efad351fb60ed485

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

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

data/lib/eyes_appium.rb

@@ -3,24 +3,8 @@
 require 'eyes_selenium'
 require 'appium_lib'
 
-CURRENT_RUBY_VERSION = Gem::Version.new RUBY_VERSION
-
-RUBY_1_9_3 = Gem::Version.new '1.9.3'
-RUBY_2_0_0 = Gem::Version.new '2.0.0'
-RUBY_2_1_6 = Gem::Version.new '2.1.6'
-RUBY_2_2_2 = Gem::Version.new '2.2.2'
-RUBY_2_4_0 = Gem::Version.new '2.4.0'
-
-RUBY_KEY = [RUBY_1_9_3, RUBY_2_0_0, RUBY_2_1_6, RUBY_2_2_2, RUBY_2_4_0].select { |v| v <= CURRENT_RUBY_VERSION }.last
-
 Applitools.require_dir('appium')
 
-if RUBY_KEY >= RUBY_2_0_0
-  Applitools::Appium::Init20.init
-else
-  Applitools::Appium::Init19.init
-end
-
 if defined? Appium::Driver
   Appium::Core::Base::Driver.class_eval do
     def driver_for_eyes(eyes)
@@ -34,7 +18,8 @@ if defined? Appium::Driver
   Appium::Driver.class_eval do
     def driver_for_eyes(eyes)
       Appium.promote_appium_methods(Applitools::Appium::Driver::AppiumLib, self)
-      Applitools::Appium::Driver.new(eyes, driver: self.start_driver, is_mobile_device: true)
+      started_driver = self.http_client ? self.driver : self.start_driver
+      Applitools::Appium::Driver.new(eyes, driver: started_driver, is_mobile_device: true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_appium
 version: !ruby/object:Gem::Version
-  version: 3.17.19
+  version: 3.18.0
 platform: ruby
 authors:
 - Applitools Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_selenium
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.19
+        version: 3.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.19
+        version: 3.18.0
 - !ruby/object:Gem::Dependency
   name: appium_lib
   requirement: !ruby/object:Gem::Requirement
@@ -49,8 +49,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
@@ -63,7 +61,7 @@ homepage: https://www.applitools.com
 licenses:
 - Applitools
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +76,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: Applitools Ruby Appium 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