eyes_appium 3.17.17 → 3.17.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c04b34cca9780b28829118e7ba4d299b531fca1608a96e59730bbb2d244ef4c
-  data.tar.gz: 6a2ebfd2606c3bbc82f33f7afe10889cdac340cc5626a01c4449cf0a88107d6c
+  metadata.gz: d548d80f8f62f27431cf406721de70b14ba54e21f4262513ab46b7ecf7f25fd1
+  data.tar.gz: 36c8f0d24954f3894690944df1124832399e333369d26d6970c008cca7a08d3e
 SHA512:
-  metadata.gz: 5773d480a6889c437877fde98f9292cc76b0c80ea3f28cf06e2301e1894dd64e3a0ada05b83a2a709541a6b32c64ade310fcfdd44fae866600c97f4210a85233
-  data.tar.gz: 56ae9e2a195906b96ccbc3f98ca2ae3e739750f688db7ab652db9ef14d132b8a811e89fa49973bc6850464dbd4ac32e7e9ce7ef5e3791eece3acad35089d8d3c
+  metadata.gz: e374bc938d297ead0eda2e20bc4798eaea2c882e0b46eabdc95d84e16046f0ce5ce869b1d2f5895f027256137cb21339fbdce447471625b2969afc1b6507b8e8
+  data.tar.gz: 78c9a400553dd78b3fc9d3dd3e58fe77dec6b31dc03a7acde34a8609a87cab23aea532608ed4bde03f0a41d242eb1813c9ca30076206f680c154161f1be236f5

data/lib/applitools/appium/android_region_provider.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative 'region_provider'
+module Applitools
+  module Appium
+    class AndroidRegionProvider < ::Applitools::Appium::RegionProvider
+      private
+
+      def convert_element_coordinates
+        Applitools::Region.from_location_size(eye_region.location, eye_region.size)
+      end
+
+      def convert_viewport_rect_coordinates
+        region  = viewport_rect
+        Applitools::Region.new(
+            region['left'],
+            region['top'],
+            region['width'],
+            region['height']
+        )
+      end
+    end
+  end
+end

data/lib/applitools/appium/eyes.rb

@@ -2,6 +2,7 @@
 
 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
@@ -51,7 +52,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
 
     eyes_element = target_to_check.region_to_check.call(driver)
     self.eyes_element_to_check = eyes_element
-    region_provider = Applitools::Appium::RegionProvider.new(driver, eyes_element)
+    region_provider = region_provider_class.new(driver, eyes_element)
     match_data.read_target(target_to_check, driver)
 
     check_window_base(
@@ -119,16 +120,19 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
 
   def viewport_screenshot
     logger.info 'Viewport screenshot requested...'
-
-    self.screenshot = screenshot_class.new(
-      Applitools::Screenshot.from_datastream(driver.screenshot_as(:png))
-    )
+    obtain_viewport_screenshot
   end
 
   def element_screenshot
     logger.info 'Element screenshot requested...'
+    obtain_viewport_screenshot
+  end
+
+  def obtain_viewport_screenshot
     self.screenshot = screenshot_class.new(
-      Applitools::Screenshot.from_datastream(driver.element_screenshot_as(eyes_element_to_check, :png))
+        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)
     )
   end
 
@@ -137,4 +141,10 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
     return Applitools::Appium::AndroidScreenshot if Applitools::Utils::EyesSeleniumUtils.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)
+    raise Applitools::EyesError, 'Unknown device type'
+  end
 end

data/lib/applitools/appium/ios_region_provider.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+#
+require_relative 'region_provider'
+module Applitools
+  module Appium
+    class IosRegionProvider < ::Applitools::Appium::RegionProvider
+      private
+
+      def convert_element_coordinates
+        Applitools::Region.from_location_size(eye_region.location, eye_region.size).
+            scale_it!(scale_factor)
+      end
+
+      def convert_viewport_rect_coordinates
+        region  = viewport_rect
+        Applitools::Region.new(
+          region['left'],
+          region['top'],
+          region['width'],
+          region['height']
+        )
+      end
+    end
+  end
+end

data/lib/applitools/appium/region_provider.rb

@@ -3,23 +3,48 @@
 module Applitools
   module Appium
     class RegionProvider
-      attr_accessor :driver, :eye_region, :coordinate_type
+      attr_accessor :driver, :eye_region, :region_to_check
 
       def initialize(driver, eye_region)
         self.driver = driver
         self.eye_region = eye_region
+        self.region_to_check = Applitools::Region::EMPTY
+        convert_region_coordinates
       end
 
       def region
-        return Applitools::Region::EMPTY if
-            [::Selenium::WebDriver::Element, Applitools::Selenium::Element].include? eye_region.class
-        region = driver.session_capabilities['viewportRect']
-        Applitools::Region.new(
-          region['left'],
-          region['top'],
-          region['width'],
-          region['height']
-        )
+        region_to_check
+      end
+
+      def coordinate_type
+        nil
+      end
+
+      private
+
+      def viewport_rect
+        Applitools::Utils::EyesSeleniumUtils.viewport_rect(driver)
+      end
+
+      def convert_region_coordinates
+        self.region_to_check = case eye_region
+                               when ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+                                  convert_element_coordinates
+                               else
+                                  convert_viewport_rect_coordinates
+                               end
+      end
+
+      def convert_element_coordinates
+        raise Applitools::AbstractMethodCalled.new(:convert_region_coordinates, 'Applitools::Appium::RegionProvider')
+      end
+
+      def convert_viewport_rect_coordinates
+        raise Applitools::AbstractMethodCalled.new(:convert_viewport_rect_coordinates, 'Applitools::Appium::RegionProvider')
+      end
+
+      def scale_factor
+        Applitools::Utils::EyesSeleniumUtils.device_pixel_ratio(driver)
       end
     end
   end

data/lib/applitools/appium/utils.rb

@@ -28,7 +28,7 @@ module Applitools::Appium
     def device_pixel_ratio(executor)
       session_info = session_capabilities(executor)
       return session_info['pixelRatio'].to_f if session_info['pixelRatio']
-      Applitools::Selenium::Eyes::UNKNOWN_DEVICE_PIXEL_RATIO
+      1
     end
 
     def status_bar_height(executor)
@@ -37,6 +37,17 @@ module Applitools::Appium
       0
     end
 
+    def viewport_rect(executor)
+      session_info = session_capabilities(executor)
+      return session_info['viewportRect'] if session_info['viewportRect']
+      {
+        'left' => 0,
+        'top' => 0,
+        'width' => 0,
+        'height' => 0
+      }
+    end
+
     def session_capabilities(executor)
        executor.session_capabilities if executor.respond_to? :session_capabilities
     end

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_appium
 version: !ruby/object:Gem::Version
-  version: 3.17.17
+  version: 3.17.18
 platform: ruby
 authors:
 - Applitools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-01 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.17
+        version: 3.17.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.17
+        version: 3.17.18
 - !ruby/object:Gem::Dependency
   name: appium_lib
   requirement: !ruby/object:Gem::Requirement
@@ -45,11 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/applitools/appium/android_region_provider.rb
 - 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
 - lib/applitools/appium/screenshot.rb