eyes_selenium 3.17.6 → 3.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81278b147df24895ba9b7ca6182a8c709c8e64df2c5abc74e5f834260825aed
-  data.tar.gz: 1dc8b2beaa8b84b39d5e7663f897ea6bdf43ed7b7e3769955f20dbb3df6348e2
+  metadata.gz: d1e1cc6d5f14b8764c463018f3f808431682bb3cb7feedacc1c4d078c8bf2856
+  data.tar.gz: 695298fd561d6c9a9736f16358135a3805417e18190daf6d9e349d47cc18a9db
 SHA512:
-  metadata.gz: b8190f7ef1c3bbc79d5e99b9c46cbfe1a209267349ca787f76cab54c1297d414efbe8de2fd1c35fdfcff6f8f6a66436619b58f274be4a6edb913db26f92d6b41
-  data.tar.gz: aab5775f889d219b99e0d01080e1fcd381f7e9b1f363ffbc23287b713561d62f54d6ca3bcd9b42522937872d5d53ab39239516b395e3988a37d5f08b7010652b
+  metadata.gz: ac8f4829d35af73da8fbd52bf3fec733d8231575d8c8721c9fffc9ae23a22fcc3af3ddce45f90c0ec024dfb2202ac3bcb59201bcc54bcde3c60894e1618080bc
+  data.tar.gz: 02ba588e928af04592b2bdffa57be76adc4c19d235d63649e82f3fc46e707fa4afa8fff65665e2aee77c8e49a3da2c8c3a88972be0edea01b77d154f3fad1693

data/lib/applitools/selenium/target.rb

@@ -21,7 +21,7 @@ module Applitools
 
       attr_accessor :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions,
         :floating_regions, :frame_or_element, :regions, :layout_regions, :content_regions,
-        :strict_regions, :accessibility_regions
+        :strict_regions, :accessibility_regions, :convert_coordinates_block
 
       private :frame_or_element, :frame_or_element=
 
@@ -33,6 +33,7 @@ module Applitools
           script_hooks: { beforeCaptureScreenshot: '' }
         }
         self.regions = {}
+        self.convert_coordinates_block = nil
         reset_for_fullscreen
       end
 
@@ -374,6 +375,10 @@ module Applitools
         nil
       end
 
+      def convert_coordinates(&block)
+        self.convert_coordinates_block = block
+      end
+
       private
 
       def reset_for_fullscreen

data/lib/applitools/selenium/visual_grid/eyes_connector.rb

@@ -54,7 +54,6 @@ module Applitools
           logger.error "Error retrieving coordinates for region #{e.region}"
           logger.error e.message
         end
-
         check_result = check_window_base(
           dummy_region_provider, timeout, match_data
         )

data/lib/applitools/selenium/visual_grid/vg_match_window_data.rb

@@ -3,6 +3,15 @@
 module Applitools
   module Selenium
     class VgMatchWindowData < Applitools::MatchWindowData
+      CONVERT_COORDINATES = proc do |region, selector_regions|
+        begin
+          offset_region = selector_regions.last
+          new_location = region.location.offset_negative(Applitools::Location.new(offset_region['x'].to_i, offset_region['y'].to_i))
+          region.location = new_location
+        rescue
+          Applitools::EyesLogger.error("Failed to convert coordinates for #{region}")
+        end
+      end
       class RegionCoordinatesError < ::Applitools::EyesError
         attr_accessor :region
         def initialize(region, message)
@@ -109,7 +118,11 @@ module Applitools
             region = selector_regions[target.regions[region]]
             raise RegionCoordinatesError.new(r, region['error']) if region['error']
             retrieved_region = Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
-            result_region = r.padding_proc.call(retrieved_region) if r.padding_proc.is_a? Proc
+            result_region = if r.padding_proc.is_a? Proc
+              r.padding_proc.call(retrieved_region)
+            else
+              retrieved_region
+            end
             result << result_region
           end
         end
@@ -118,36 +131,54 @@ module Applitools
 
       def convert_ignored_regions_coordinates
         return unless @need_convert_ignored_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @ignored_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.ignored_regions = @ignored_regions.map(&:with_padding).map(&:to_hash)
         @need_convert_ignored_regions_coordinates = false
       end
 
       def convert_floating_regions_coordinates
         return unless @need_convert_floating_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @floating_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.floating_regions = @floating_regions
         @need_convert_floating_regions_coordinates = false
       end
 
       def convert_layout_regions_coordinates
         return unless @need_convert_layout_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @layout_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.layout_regions = @layout_regions
         @need_convert_layout_regions_coordinates = false
       end
 
       def convert_strict_regions_coordinates
         return unless @need_convert_strict_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @strict_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.strict_regions = @strict_regions
         @need_convert_strict_regions_coordinates = false
       end
 
       def convert_content_regions_coordinates
         return unless @need_convert_content_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @content_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.content_regions = @content_regions
         @need_convert_content_regions_coordinates = false
       end
 
       def convert_accessibility_regions_coordinates
         return unless @need_convert_accessibility_regions_coordinates
+        if target.convert_coordinates_block.is_a?(Proc)
+          @accessibility_regions.each { |r| target.convert_coordinates_block.call(r, selector_regions)}
+        end
         self.accessibility_regions = @accessibility_regions
         @need_convert_accessibility_regions_coordinates = false
       end

data/lib/applitools/selenium/visual_grid/visual_grid_eyes.rb

@@ -154,6 +154,7 @@ module Applitools
             mod = Digest::SHA2.hexdigest(script_thread_result[:script_result])
 
             region_x_paths = get_regions_x_paths(target_to_check)
+
             render_task = RenderTask.new(
               "Render #{config.short_description} - #{tag}",
               script_thread_result[:result]['value'],
@@ -169,6 +170,10 @@ module Applitools
             )
           end
 
+          if size_mod == 'selector'
+            target_to_check.convert_coordinates(&Applitools::Selenium::VgMatchWindowData::CONVERT_COORDINATES)
+          end
+
           title = begin
             driver.title
           rescue StandardError => e

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.17.6
+  version: 3.17.7
 platform: ruby
 authors:
 - Applitools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.6
+        version: 3.17.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.6
+        version: 3.17.7
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement