eyes_selenium 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 175a713110c4d481e6aeaa485c27468942f85a106d2c979d0afcce55ec980ccd
-  data.tar.gz: 6cc119432abf25a1f04ab70d3d408aed7d943032c7e1a68abd14fc63d15ca3ad
+  metadata.gz: b26b8cab2a5dee12cd6762d42835c5ac5a551c301dbaabd6ad3eee5a654a5d8e
+  data.tar.gz: 0ba8f11f92e059a7bee775aa3e531be9acf73c1f21838463492b606eb9c37856
 SHA512:
-  metadata.gz: 7e093f8025fa36d0cd251557c723a8b1dd69b7bf18f078e6e639041f765e6c73a2d213de0d76a3dda8106c9c19ad7b81ef9bfa775e1136cfcd794255953a8303
-  data.tar.gz: ae252db3790c0da5474b3acb7c4a60b6cc02704764c543366d9dfa33d4fa6ed8e262bfe0d188d0ba399f6e9f7d35f7f1c23582cc01898d1ebc38a88355612195
+  metadata.gz: 81a285c6e029db6f3d93844a2cfc89bdb8ed4af57bc3d5d56023dd29c0c0e606f3ca6d000dd05bd4825c485c731fd18b36d15c13a94b7a0da678df95d3f92011
+  data.tar.gz: 95ab65d07256a45d79f130ab6ba84221bdbf27fd8f90533600e4520349d343794abb8557579002fca2c9df0285087c762c764340b81f736804736dae6b54d5d6

data/lib/applitools/selenium/target.rb

@@ -49,10 +49,8 @@ module Applitools
         if args.empty?
           reset_ignore
         else
-          value = convert_to_universal(args)
-          value = { type: args[0], selector: args[1] } if value.nil?
-          value = value[:selector] if value.is_a?(Hash) && (value[:type].to_s === 'id')
-          ignored_regions << value
+          region = region_from_args(args)
+          ignored_regions << region if region
         end
         self
       end
@@ -81,33 +79,36 @@ module Applitools
       # @!parse def floating(region_or_element, bounds, left,top, right, bottom, padding); end;
 
       def floating(*args)
-        requested_padding = get_requested_padding(args)
+        options = Applitools::Utils.extract_options!(args)
+        padding = options && options[:padding]
+        requested_padding = get_requested_padding(padding, args)
+        bounds = get_bounds(args)
         value = convert_to_universal(args)
         value = { type: args[0], selector: args[1] } if value.nil?
         value = value[:selector] if value.is_a?(Hash) && (value[:type].to_s === 'id')
-        value = { region: value }.merge(requested_padding)
-        floating_regions << value
+        region = { region: value }
+        region.merge!(bounds) if bounds != {}
+        region.merge!(padding: requested_padding) if requested_padding != {}
+        region.merge!(regionId: options[:region_id]) if options[:region_id]
+        floating_regions << region
         self
       end
 
       def layout(*args)
-        return match_level(Applitools::MatchLevel::LAYOUT) if args.empty?
-        region = process_region(*args)
-        layout_regions << region
+        region = region_from_args(args)
+        layout_regions << region if region
         self
       end
 
       def content(*args)
-        return match_level(Applitools::MatchLevel::CONTENT) if args.empty?
-        region = process_region(*args)
-        content_regions << region
+        region = region_from_args(args)
+        content_regions << region if region
         self
       end
 
       def strict(*args)
-        return match_level(Applitools::MatchLevel::STRICT) if args.empty?
-        region = process_region(*args)
-        strict_regions << region
+        region = region_from_args(args)
+        strict_regions << region if region
         self
       end
 
@@ -400,16 +401,41 @@ module Applitools
         driver.find_element(:xpath, xpath)
       end
 
-      def get_requested_padding(args)
+      def get_requested_padding(padding, args)
+        return padding.to_hash if padding && padding.is_a?(Applitools::PaddingBounds)
+        return padding if padding && (padding.is_a?(Hash) || padding.is_a?(Numeric))
         if args.last.is_a? Applitools::PaddingBounds
           args.pop
-        elsif args.last.is_a?(Applitools::FloatingBounds)
-          args.pop.to_hash
+        # elsif args.last.is_a?(Applitools::FloatingBounds)
+        #   args.pop.to_hash
         else
           {}
         end
       end
 
+      def get_bounds(args)
+        return args.pop.to_hash if args.last.is_a?(Applitools::FloatingBounds)
+        last4 = args.last(4)
+        if last4.size === 4 && last4.all? { |e| e.is_a?(Numeric) }
+          FloatingBounds.new(*last4).to_hash
+        else
+          {}
+        end
+      end
+
+      def region_from_args(args)
+        options = Applitools::Utils.extract_options!(args)
+        padding = options && options[:padding]
+        requested_padding = get_requested_padding(padding, args)
+        value = convert_to_universal(args)
+        value = { type: args[0], selector: args[1] } if value.nil?
+        value = value[:selector] if value.is_a?(Hash) && (value[:type].to_s === 'id')
+        return nil if value === {selector: nil, type: nil}
+        region = { region: value }
+        region.merge!(padding: requested_padding) if requested_padding != {}
+        region.merge!(regionId: options[:region_id]) if options[:region_id]
+        region
+      end
 
 
       def is_element?(el)

data/lib/applitools/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.1.1'.freeze
-  UNIVERSAL_VERSION = '2.8.0'.freeze
+  VERSION = '4.1.2'.freeze
+  UNIVERSAL_VERSION = '2.9.5'.freeze
 end

metadata

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