eyes_selenium 3.17.3 → 3.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a287486a3c2db8fe596472fc9913fe78e986f808e85d7aff75a864af7d2eb882
-  data.tar.gz: 9dc948821e7024ecd298fbd79e139a3b18ec49cf0abd18b508379f78010257cb
+  metadata.gz: cee50953eeafc5c79aeba64ca7a506c6d02ae1f16ae8f291995672f72d2a3776
+  data.tar.gz: 965ffbea40553262623b7a8a11eecd6a91790bf1156cc6c8503c558f9d3f9267
 SHA512:
-  metadata.gz: e6985305123510272024b48190c15254d026835251fd7d5fcead42988a32e6f09b3c4155870729a8ded879aef9aa2523fbc40951d4e6364bbfc12c7e960e0a04
-  data.tar.gz: e1c697f8a30a19d97ad28d2cc488b4d22da34fdc78b62cbe46f44028be0e93f4a9bfed34706116dd2c516afc6349bfff4dd4a5da5bfe4c3c066fc81ed211ffd7
+  metadata.gz: 9de3224015a3c8b6579f609e64437d9072e56013964dd99f4a45c8b5bef4293f9e1e1adeda1e3a5d03ced3846e2540c5d597ddd5aa02e59f727dc42e61d4f6b2
+  data.tar.gz: 50224783e3c42e3b2c592c8311111a1bafb2ac6a3cbee17e39187d90696656854f4a0caa80283537102a0a0317f57b4db6ba6a827683263b65f55cc48a72d877

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)
         }
@@ -18,26 +18,40 @@ module Applitools
         end
       end
 
+      object_field :emulation_info, Applitools::Selenium::EmulationBaseInfo
+
       # def device_name
       #   emulation_info.device_name
       # 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
 
+      def to_s
+        "#{emulation_info.device_name} - #{emulation_info.screen_orientation}"
+      end
+
+      def device_name
+        emulation_info.device_name + ' (chrome emulation)'
+      end
+
+
       private
 
       class EmulationInfo < Applitools::Selenium::EmulationBaseInfo

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,15 +29,17 @@ 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'
         end
       end
 
+      def device_name
+        'desktop'
+      end
+
     end
   end
 end
-
-Applitools::Selenium::RenderBrowserInfo = Applitools::Selenium::DesktopBrowserInfo

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,22 +3,18 @@ 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
-      object_field :emulation_info, Applitools::Selenium::EmulationBaseInfo
-      object_field :ios_device_info, Applitools::Selenium::EmulationBaseInfo
 
-      def device_name
-        return 'desktop' unless emulation_info || ios_device_info
-        return ios_device_info.device_name if ios_device_info
-        return emulation_info.device_name + ' (chrome emulation)' if emulation_info
+      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})" unless emulation_info
-        "#{emulation_info.device_name} - #{emulation_info.screen_orientation}"
+        return "#{viewport_size} (#{browser_type})"
       end
     end
   end

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

@@ -11,6 +11,9 @@ module Applitools
             viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
         }
       end
+
+      object_field :ios_device_info, Applitools::Selenium::EmulationBaseInfo
+
       class << self
         def default_config
           DEFAULT_CONFIG.call
@@ -18,18 +21,26 @@ 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
 
+      def to_s
+        "#{ios_device_info.device_name} - #{ios_device_info.screen_orientation}"
+      end
+
+      def device_name
+        ios_device_info.device_name
+      end
+
       private
 
       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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require 'applitools/selenium/browser_types'
+# We should not break the API
+module Applitools
+  module Selenium
+    class RenderBrowserInfo < IRenderBrowserInfo
+      DEFAULT_CONFIG = proc do
+        {
+            platform: 'linux',
+            browser_type: BrowserTypes::CHROME,
+            # size_mode: 'full-page',
+            viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
+        }
+      end
+
+      object_field :ios_device_info, Applitools::Selenium::EmulationBaseInfo
+      object_field :emulation_info, Applitools::Selenium::EmulationBaseInfo
+
+      class << self
+        def default_config
+          DEFAULT_CONFIG.call
+        end
+      end
+
+      def initialize(options = {})
+        super
+        if options[:width] && options[:height]
+          self.viewport_size = Applitools::RectangleSize.from_any_argument(width: options[:width], height: options[:height])
+        end
+        self.browser_type = options[:browser_type] if options[:browser_type]
+      end
+
+      def platform
+        return 'ios' if ios_device_info
+        case browser_type
+        when BrowserType::EDGE_LEGACY, BrowserType::EDGE_CHROMIUM, BrowserType::EDGE_CHROMIUM_ONE_VERSION_BACK
+          'windows'
+        else
+          'linux'
+        end
+      end
+
+      def to_s
+        if emulation_info
+          "#{emulation_info.device_name} - #{emulation_info.screen_orientation}"
+        elsif ios_device_info
+          "#{ios_device_info.device_name} - #{ios_device_info.screen_orientation}"
+        end
+        "#{viewport_size} (#{browser_type})"
+      end
+
+      def device_name
+        if ios_device_info
+          return ios_device_info.device_name
+        elsif emulation_info
+          return emulation_info.device_name + ' (chrome emulation)'
+        end
+        'desktop'
+      end
+    end
+  end
+end

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

@@ -248,8 +248,11 @@ module Applitools
             r.height = running_test.browser_info.viewport_size.height
             r.size_mode = size_mode
             r.region = region_to_check
-            r.emulation_info = running_test.browser_info.emulation_info if running_test.browser_info.emulation_info
-            r.ios_device_info = running_test.browser_info.ios_device_info if running_test.browser_info.ios_device_info
+            if running_test.browser_info.respond_to?(:emulation_info) && running_test.browser_info.emulation_info
+              r.emulation_info = running_test.browser_info.emulation_info
+            elsif running_test.browser_info.respond_to?(:ios_device_info) && running_test.browser_info.ios_device_info
+              r.ios_device_info = running_test.browser_info.ios_device_info
+            end
           end
 
           requests << Applitools::Selenium::RenderRequest.new(

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.3'.freeze
+  VERSION = '3.17.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.17.3
+  version: 3.17.9
 platform: ruby
 authors:
 - Applitools Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-19 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.3
+        version: 3.17.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.3
+        version: 3.17.9
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - lib/applitools/selenium/visual_grid/ios_device_info.rb
 - lib/applitools/selenium/visual_grid/ios_device_name.rb
 - lib/applitools/selenium/visual_grid/ios_screen_orientation.rb
+- lib/applitools/selenium/visual_grid/render_browser_info.rb
 - lib/applitools/selenium/visual_grid/render_info.rb
 - lib/applitools/selenium/visual_grid/render_request.rb
 - lib/applitools/selenium/visual_grid/render_requests.rb
@@ -177,7 +178,7 @@ homepage: https://www.applitools.com
 licenses:
 - Applitools
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Applitools Ruby Selenium SDK
 test_files: []