eyes_selenium 3.17.5 → 3.17.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119f032b65d1a768ae420679f6cb509480505767691d86b7417f3cb210fb7e8d
-  data.tar.gz: 100b6606ffb9a405d5e042a7d424fedd96599a426235ba1056792056c26d771e
+  metadata.gz: 179a2322de13d9299fdcc66e2a9dde36f4440a7a451a1ce53a7c5ca7da7b6c23
+  data.tar.gz: 4a2c18e3617073c3bdbab7272301b6159752458e6ce4b72a7386b0381fe9e8fb
 SHA512:
-  metadata.gz: c48cea011af489db8c29a06b1b6b7ac3a10ab733f22fe46e9dc70ac9a0bd587bc5ed960c98692f34f39521e99f14d8dc3c7eb559de8ed3b9eb0adec2da41e5c6
-  data.tar.gz: 4388fbfb94018ef6629f019ece08eee0186bdcad74dcad6b83815aafb4a4c44b04233522d73b1f18bd829c395781b7e1610c7d419514abf3c0a772b01ae4cd61
+  metadata.gz: 2f7da3b0a527dd932b137f4c80f609083205282a1ef437d3bf1d90ef2fc5f31840655518dc34e1639e0cf10fa1e5f2abfbf24057c8a2c71c8e654d30a28e8871
+  data.tar.gz: b7d6cc9a3b7f3c42d338c1990c313c96f4a8e0ac5d17c798cfbaa4b47aca11091b1bdb9f4301f830367dc8f32a38e74a250724729fc127ba300e1d7f1b355acd

data/lib/applitools/selenium/configuration.rb

@@ -57,7 +57,13 @@ module Applitools
         self
       end
 
-      def add_browsers(browsers)
+      def add_browsers(*browsers)
+        browsers = case browsers.first
+                     when Applitools::Selenium::IRenderBrowserInfo
+                       browsers
+                     when Array
+                       browsers.first
+                   end
         browsers.each do |browser|
           add_browser(browser)
         end

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

@@ -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/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/ios_device_info.rb

@@ -1,12 +1,12 @@
 require_relative 'ios_device_name'
-require_relative 'ios_screen_orientation'
+
 module Applitools
   module Selenium
     class IosDeviceInfo < IRenderBrowserInfo
       DEFAULT_CONFIG = proc do
         {
             platform: 'ios',
-            browser_type: BrowserTypes::IOS_SAFARI,
+            browser_type: BrowserType::IOS_SAFARI,
             # size_mode: 'full-page',
             viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
         }
@@ -24,7 +24,7 @@ module Applitools
         super
         self.ios_device_info = EmulationInfo.new.tap do |ei|
           ei.device_name = options[:device_name]
-          ei.screen_orientation = options[:screen_orientation] || options[:orientation] || IosScreenOrientation::PORTRAIT
+          ei.screen_orientation = options[:screen_orientation] || options[:orientation] || Orientation::PORTRAIT
         end
       end
 
@@ -40,7 +40,7 @@ module Applitools
 
       class EmulationInfo < EmulationBaseInfo
         enum_field :device_name, IosDeviceName.enum_values
-        enum_field :screen_orientation, IosScreenOrientation.enum_values
+        enum_field :screen_orientation, Orientation.enum_values
 
         def json_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

@@ -63,7 +63,7 @@ module Applitools
         config.test_name = options[:test_name] if config.test_name.nil? || config.test_name && config.test_name.empty?
 
         if config.viewport_size.nil? || config.viewport_size && config.viewport_size.empty?
-          config.viewport_size = Applitools::RectangleSize.from_any_argument(options[:viewport_size])
+          config.viewport_size = Applitools::RectangleSize.from_any_argument(options[:viewport_size]) if options[:viewport_size]
         end
 
         self.driver = Applitools::Selenium::SeleniumEyes.eyes_driver(options.delete(:driver), self)
@@ -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.5'.freeze
+  VERSION = '3.17.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.17.5
+  version: 3.17.11
 platform: ruby
 authors:
 - Applitools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-25 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.5
+        version: 3.17.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.5
+        version: 3.17.11
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ files:
 - lib/applitools/selenium/visual_grid/i_render_browser_info.rb
 - 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

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

@@ -1,14 +0,0 @@
-module IosScreenOrientation
-  extend self
-  PORTRAIT ='portrait'
-  LANDSCAPE_LEFT = 'landscapeLeft'
-  LANDSCAPE_RIGHT = 'landscapeRight'
-
-  def enum_values
-    [
-      PORTRAIT,
-      LANDSCAPE_LEFT,
-      LANDSCAPE_RIGHT
-    ]
-  end
-end