eyes_selenium 3.15.22 → 3.15.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4afa38dc1072ebb2967eb23560548ebc4bd9843bb24c926c228380d28f18be2
-  data.tar.gz: b5aa0a6992230a27cd0f5768a44ee48b0807d56c5d31ca43672ad97c5bd9a251
+  metadata.gz: 986dbce2e6280a576f7ab916cfa1bb5ffdd70f2ffbbc298733b0365d67e7b8e6
+  data.tar.gz: e0a78d9fb68f03c2810fd862bb5342d489f7571b16a538e236ce10f9ea71ab43
 SHA512:
-  metadata.gz: 4c830ca945efe89a44b17b4f3c2c1747e0104d9c3d8eee9993822f517311400bdef380d03b3120a776326cceaace429a6825d84e453de1e3f598c4f384cae955
-  data.tar.gz: f481e17e945fce5c3623471feed14a8a60c1a0e7067aaade06c4f46593451122bcb1bfef20f48dc54e0f24e7d53f3647977f7eb16a9d60714a05b05f4d60acde
+  metadata.gz: eaee95474c4f65ff04b697c98ce8b287af37c5f0c33cd79e3e109361f37cbee53bb8d100a6c8a3a09b957209b682778120ab5e87296d9b277e86b1a2f0e7d0a3
+  data.tar.gz: 9f42265a406214b02fa979bfb26f1e82dc058d067a988208ecb37bc4ff01e2bce604afe58872a9d102d655f561692bf34c1a79fad37fec9b6aeb963b6abe3396

data/lib/applitools/selenium/target.rb

@@ -19,7 +19,8 @@ module Applitools
       end
 
       attr_accessor :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions,
-        :floating_regions, :frame_or_element, :regions
+        :floating_regions, :frame_or_element, :regions, :match_level, :layout_regions, :content_regions,
+        :strict_regions
 
       private :frame_or_element, :frame_or_element=
 
@@ -144,6 +145,53 @@ module Applitools
         self
       end
 
+      def layout(*args)
+        return match_level(Applitools::MatchLevel::LAYOUT) if args.empty?
+        region = process_region(*args)
+        layout_regions << region
+        self
+      end
+
+      def content(*args)
+        return match_level(Applitools::MatchLevel::CONTENT) if args.empty?
+        region = process_region(*args)
+        content_regions << region
+        self
+      end
+
+      def strict(*args)
+        return match_level(Applitools::MatchLevel::STRICT) if args.empty?
+        region = process_region(*args)
+        strict_regions << region
+        self
+      end
+
+      def exact(*args)
+        return match_level(Applitools::MatchLevel::EXACT) if args.empty?
+        raise Applitools::EyesError('Target.exact() is supposed to be called without args!')
+        # region = process_region(args)
+        # exact_regions << region
+        # self
+      end
+
+      def process_region(*args)
+        r = args.first
+        case r
+        when Applitools::Region, ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+          proc { r }
+        else
+          proc do |driver|
+            args_dup = args.dup
+            driver.find_element(args_dup.shift, args_dup.shift)
+          end
+        end
+      end
+
+      def match_level(*args)
+        value = args.shift
+        self
+      end
+
       def fully(value = true)
         options[:stitch_content] = value ? true : false
         handle_frames
@@ -218,6 +266,9 @@ module Applitools
         self.region_to_check = proc { Applitools::Region::EMPTY }
         reset_ignore
         reset_floating
+        reset_content_regions
+        reset_layout_regions
+        reset_strict_regions
         options[:stitch_content] = false
         options[:timeout] = nil
         options[:trim] = false
@@ -231,6 +282,18 @@ module Applitools
         self.floating_regions = []
       end
 
+      def reset_layout_regions
+        self.layout_regions = []
+      end
+
+      def reset_content_regions
+        self.content_regions = []
+      end
+
+      def reset_strict_regions
+        self.strict_regions = []
+      end
+
       def handle_frames
         return unless frame_or_element
         frames << frame_or_element

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

@@ -28,6 +28,21 @@ module Applitools
           end
         end
 
+        if target.respond_to? :layout_regions
+          @layout_regions = obtain_regions_coordinates(target.layout_regions, driver)
+          @need_convert_layout_regions_coordinates = true unless @layout_regions.empty?
+        end
+
+        if target.respond_to? :content_regions
+          @content_regions = obtain_regions_coordinates(target.content_regions, driver)
+          @need_convert_content_regions_coordinates = true unless @content_regions.empty?
+        end
+
+        if target.respond_to? :strict_regions
+          @strict_regions = obtain_regions_coordinates(target.strict_regions, driver)
+          @need_convert_strict_regions_coordinates = true unless @strict_regions.empty?
+        end
+
         # # floating regions
         return unless target.respond_to? :floating_regions
         target.floating_regions.each do |r|
@@ -48,6 +63,21 @@ module Applitools
         end
       end
 
+      def obtain_regions_coordinates(regions, driver)
+        result = []
+        regions.each do |r|
+          case r
+          when Proc
+            region = r.call(driver)
+            region = selector_regions[target.regions[region]]
+            result << Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
+          when Applitools::Region
+            result << r
+          end
+        end
+        result
+      end
+
       def convert_ignored_regions_coordinates
         return unless @need_convert_ignored_regions_coordinates
         self.ignored_regions = @ignored_regions.map(&:with_padding).map(&:to_hash)
@@ -60,6 +90,23 @@ module Applitools
         @need_convert_floating_regions_coordinates = false
       end
 
+      def convert_layout_regions_coordinates
+        return unless @need_convert_layout_regions_coordinates
+        self.layout_regions = @layout_regions
+        @need_convert_layout_regions_coordinates = false
+      end
+
+      def convert_strict_regions_coordinates
+        return unless @need_convert_strict_regions_coordinates
+        self.strict_regions = @strict_regions
+        @need_convert_strict_regions_coordinates = false
+      end
+
+      def convert_content_regions_coordinates
+        return unless @need_convert_content_regions_coordinates
+        self.content_regions = @content_regions
+        @need_convert_content_regions_coordinates = false
+      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Applitools
   module Selenium
     class VisualGridEyes
       DOM_EXTRACTION_TIMEOUT = 300 #seconds or 5 minutes
+      USE_DEFAULT_MATCH_TIMEOUT = -1
       extend Forwardable
 
       def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
@@ -131,7 +132,7 @@ module Applitools
         #   end.compact!
         # end
         result = []
-        regions_hash = collect_selenium_regions(target).each do |el, v|
+        collect_selenium_regions(target).each do |el, v|
           if [::Selenium::WebDriver::Element, Applitools::Selenium::Element].include?(el.class)
             xpath = driver.execute_script(Applitools::Selenium::Scripts::GET_ELEMENT_XPATH_JS, el)
             web_element_region = Applitools::Selenium::WebElementRegion.new(xpath, v)
@@ -145,23 +146,25 @@ module Applitools
 
       def collect_selenium_regions(target)
         selenium_regions = {}
-        # ignore_regions = target.ignored_regions
-        # floating_regions = target.floating_regions
         target_element = target.region_to_check
         setup_size_mode(target_element)
-        # selenium_regions.map do |r|
-        #   element_or_region(r)
-        # end
         target.ignored_regions.each do |r|
           selenium_regions[element_or_region(r)] = :ignore
         end
         target.floating_regions.each do |r|
           selenium_regions[element_or_region(r)] = :floating
         end
+        target.layout_regions.each do |r|
+          selenium_regions[element_or_region(r)] = :layout
+        end
+        target.strict_regions.each do |r|
+          selenium_regions[element_or_region(r)] = :strict
+        end
+        target.content_regions.each do |r|
+          selenium_regions[element_or_region(r)] = :content
+        end
         selenium_regions[region_to_check] = :target if size_mod == 'selector'
 
-        # selenium_regions[:ignore] += [target.ignored_regions.map { |r| element_or_region(r) }].flatten.compact
-        # selenium_regions[:target] << region_to_check if size_mod == 'selector'
         selenium_regions
       end
 

data/lib/applitools/version.rb

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

metadata

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