eyes_selenium 3.17.4 → 3.17.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab60fb86502ed730997a08c2de160bab0bbff7bc9651a7773fdd3e2971d49b18
-  data.tar.gz: 717c9ec052aac3390691551e0e83febf7af4582f643031d49cd61226f6f61e86
+  metadata.gz: 65a0bdc234bb2f3a65da2e815b70ed012b1ffd1d0cda9dfacbd020adb1fee174
+  data.tar.gz: a360ea896e3f78638056e97569da66709a1e6c8926187ffe81cf02f6ac253733
 SHA512:
-  metadata.gz: 49b8e28b830cd12d2cd5af053a07218ab9081d155d569fd1f42579ebcbe43e16c06612de3221b25a984a0928e4bb1e311c26d541b341b1f27d6f498fb7d430aa
-  data.tar.gz: fab03f7637243850574bcf4354fdcbc7f0d26d55aabb8070daafdc199196ae27e9370f0c68ae717ba204fde2b3eb4fa904b41ae238ace4926e879c28d39b0d9e
+  metadata.gz: c4c40b1019cc770571e5df1c48aa361ee2cf382f7d91be6bcbb2c8f45308501d61f71b658246fbabf5d4fa2fc1f6334ff83265df94383510bec04827ed8c858a
+  data.tar.gz: ce0d13d3612172c78e4a59aedd7bae13d5328ec2e0eddaef21ff3d160bd517a92dcaba522691593dc9ef84f264b356c81c765f5ba68d923d6cb3c99812d80773

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

@@ -7,7 +7,7 @@ module Applitools
       DEFAULT_CONFIG = proc do
         {
             platform: 'linux',
-            browser_type: BrowserTypes::CHROME,
+            browser_type: BrowserType::CHROME,
             # size_mode: 'full-page',
             viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
         }
@@ -25,18 +25,21 @@ module Applitools
       # end
       #
       def initialize(*args)
-        super()
+        options = Applitools::Utils.extract_options!(args.dup)
+        super(options)
         case args[0]
         when String
           self.emulation_info = EmulationInfo.new.tap do |ei|
             ei.device_name = args[0]
-            ei.screen_orientation = args[1] || Orientations::PORTRAIT
+            ei.screen_orientation = args[1] || Orientation::PORTRAIT
           end
         when Hash
           self.emulation_info = EmulationInfo.new.tap do |ei|
             ei.device_name = args[0][:device_name]
-            ei.screen_orientation = args[0][:screen_orientation] || Orientations::PORTRAIT
+            ei.screen_orientation = args[0][:screen_orientation] || Orientation::PORTRAIT
           end
+        else
+          raise Applitools::EyesIllegalArgument, 'You should pass :device_name and :screen_orientation'
         end
       end
 

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

@@ -7,7 +7,7 @@ module Applitools
       DEFAULT_CONFIG = proc do
         {
             platform: 'linux',
-            browser_type: BrowserTypes::CHROME,
+            browser_type: BrowserType::CHROME,
             # size_mode: 'full-page',
             viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
         }
@@ -20,7 +20,7 @@ module Applitools
       end
 
       def initialize(options = {})
-        super()
+        super
         if options[:width] && options[:height]
           self.viewport_size = Applitools::RectangleSize.from_any_argument(width: options[:width], height: options[:height])
         end
@@ -29,7 +29,7 @@ module Applitools
 
       def platform
         case browser_type
-        when BrowserTypes::EDGE_LEGACY, BrowserTypes::EDGE_CHROMIUM, BrowserTypes::EDGE_CHROMIUM_ONE_VERSION_BACK
+        when BrowserType::EDGE_LEGACY, BrowserType::EDGE_CHROMIUM, BrowserType::EDGE_CHROMIUM_ONE_VERSION_BACK
           'windows'
         else
           'linux'

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

@@ -3,11 +3,16 @@ module Applitools
     class IRenderBrowserInfo < ::Applitools::AbstractConfiguration
 
       object_field :viewport_size, Applitools::RectangleSize
-      enum_field :browser_type, BrowserTypes.enum_values
+      enum_field :browser_type, BrowserType.enum_values
       string_field :platform
       string_field :size_mode
       string_field :baseline_env_name
 
+      def initialize(options = {})
+        super()
+        self.baseline_env_name = options[:baseline_env_name] if options[:baseline_env_name]
+      end
+
       def to_s
         return "#{viewport_size} (#{browser_type})"
       end

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

@@ -21,10 +21,10 @@ module Applitools
       end
 
       def initialize(options = {})
-        super()
+        super
         self.ios_device_info = EmulationInfo.new.tap do |ei|
           ei.device_name = options[:device_name]
-          ei.screen_orientation = options[:screen_orientation] || options[:orientation] || IosScreenshotOrientation::PORTRAIT
+          ei.screen_orientation = options[:screen_orientation] || options[:orientation] || IosScreenOrientation::PORTRAIT
         end
       end
 
@@ -40,7 +40,7 @@ module Applitools
 
       class EmulationInfo < EmulationBaseInfo
         enum_field :device_name, IosDeviceName.enum_values
-        enum_field :screen_orientation, IosScreenshotOrientation.enum_values
+        enum_field :screen_orientation, IosScreenOrientation.enum_values
 
         def json_data
           {

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

@@ -1,4 +1,4 @@
-module IosScreenshotOrientation
+module IosScreenOrientation
   extend self
   PORTRAIT ='portrait'
   LANDSCAPE_LEFT = 'landscapeLeft'

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

@@ -23,7 +23,7 @@ module Applitools
       end
 
       def initialize(options = {})
-        super()
+        super
         if options[:width] && options[:height]
           self.viewport_size = Applitools::RectangleSize.from_any_argument(width: options[:width], height: options[:height])
         end
@@ -33,7 +33,7 @@ module Applitools
       def platform
         return 'ios' if ios_device_info
         case browser_type
-        when BrowserTypes::EDGE_LEGACY, BrowserTypes::EDGE_CHROMIUM, BrowserTypes::EDGE_CHROMIUM_ONE_VERSION_BACK
+        when BrowserType::EDGE_LEGACY, BrowserType::EDGE_CHROMIUM, BrowserType::EDGE_CHROMIUM_ONE_VERSION_BACK
           'windows'
         else
           'linux'

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.4'.freeze
+  VERSION = '3.17.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.17.4
+  version: 3.17.10
 platform: ruby
 authors:
 - Applitools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-23 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.4
+        version: 3.17.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.4
+        version: 3.17.10
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement