eyes_core 3.15.22 → 3.15.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e37b73ce41da9ad639dd798606313dfac6b29e6e451903bc35152d25160924
-  data.tar.gz: e20037b45aa1119c0b5aaac3daea1ad4cc9770ab9395d36f11c2aac9a32adef2
+  metadata.gz: 8193a4da049d679616fb629be42d17037ada49ad051c44bd22b6d5efbd8f58ef
+  data.tar.gz: da5c9331be468acfacf0f7c1549bb46e86af071769aed22a4706d0e7a3b76604
 SHA512:
-  metadata.gz: 402b159825de2ed424e16ad921d4dd259bdd7ea3c8c06bdf0b3ea5a7beb70ff2ab0c9e068f78c6438788c45f715a1f42ef7f42fc50487c04e89f82d2477a3daa
-  data.tar.gz: 8ba2257cc6731e30a1da4525a46439209ba6cfc097730551cbc0f6bd88f89243a5871512e692f2714d5a7161ef8b67ae8537d59b2c7ac4a62ca262f49af68208
+  metadata.gz: 1d4c8a0258045022e274cc81a581b70da4c050bb479ae2bfc3e60ed6ed7943a60f49b263d53635b5a8af9e84e9da8bf58974002a9f5ca351861777c939f1ce3b
+  data.tar.gz: f737aec5ca6a53344bb5afb922896562387fdd1874201a89b81a09d336c5e07fadf5debab32c17c812c24d20acd88a4881cb9f295115092baba85674fc1c6c42

data/lib/applitools/core/match_window_data.rb

@@ -26,6 +26,9 @@ module Applitools
               'IgnoreDisplacements' => false,
               'Ignore' => [],
               'Floating' => [],
+              'Layout' => [],
+              'Strict' => [],
+              'Content' => [],
               'Exact' => {
                 'MinDiffIntensity' => 0,
                 'MinDiffWidth' => 0,
@@ -80,6 +83,9 @@ module Applitools
       @floating_regions = []
       @need_convert_ignored_regions_coordinates = false
       @need_convert_floating_regions_coordinates = false
+      @need_convert_strict_regions_coordinates = false
+      @need_convert_content_regions_coordinates = false
+      @need_convert_layout_regions_coordinates = false
     end
 
     def screenshot
@@ -118,6 +124,27 @@ module Applitools
       end
     end
 
+    def layout_regions=(value)
+      Applitools::ArgumentGuard.is_a? value, 'value', Array
+      value.each do |r|
+        current_data['Options']['ImageMatchSettings']['Layout'] << r.to_hash if self.class.valid_region(r)
+      end
+    end
+
+    def strict_regions=(value)
+      Applitools::ArgumentGuard.is_a? value, 'value', Array
+      value.each do |r|
+        current_data['Options']['ImageMatchSettings']['Strict'] << r.to_hash if self.class.valid_region(r)
+      end
+    end
+
+    def content_regions=(value)
+      Applitools::ArgumentGuard.is_a? value, 'value', Array
+      value.each do |r|
+        current_data['Options']['ImageMatchSettings']['Content'] << r.to_hash if self.class.valid_region(r)
+      end
+    end
+
     def app_output=(value)
       Applitools::ArgumentGuard.is_a? value, 'value', Applitools::AppOutputWithScreenshot
       @app_output = value
@@ -203,16 +230,18 @@ module Applitools
       end
       # ignored regions
       if target.respond_to? :ignored_regions
-        target.ignored_regions.each do |r|
-          case r
-          when Proc
-            @ignored_regions << r.call(driver)
-            @need_convert_ignored_regions_coordinates = true
-          when Applitools::Region
-            @ignored_regions << r
-            @need_convert_ignored_regions_coordinates = true
-          end
-        end
+        @ignored_regions = obtain_regions_coordinates(target.ignored_regions, driver)
+        @need_convert_ignored_regions_coordinates = true unless @ignored_regions.empty?
+        # target.ignored_regions.each do |r|
+        #   case r
+        #   when Proc
+        #     @ignored_regions << r.call(driver)
+        #     @need_convert_ignored_regions_coordinates = true
+        #   when Applitools::Region
+        #     @ignored_regions << r
+        #     @need_convert_ignored_regions_coordinates = true
+        #   end
+        # end
       end
 
       # floating regions
@@ -230,6 +259,39 @@ module Applitools
           @need_convert_floating_regions_coordinates = true
         end
       end
+
+      # Layout regions
+      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
+
+      # Strict regions
+      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
+
+      # Content regions
+      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
+      target
+    end
+
+    def obtain_regions_coordinates(regions, driver)
+      result = []
+      regions.each do |r|
+        case r
+        when Proc
+          region = r.call(driver)
+          result << Applitools::Region.from_location_size(region.location, region.size)
+        when Applitools::Region
+          result << r
+        end
+      end
+      result
     end
 
     def target_options_to_read
@@ -256,36 +318,79 @@ module Applitools
 
     def convert_ignored_regions_coordinates
       return unless @need_convert_ignored_regions_coordinates
-      self.ignored_regions = @ignored_regions.map do |r|
-        self.class.convert_coordinates(r, app_output.screenshot)
-      end unless app_output.screenshot.nil?
+      self.ignored_regions = convert_regions_coordinates(@ignored_regions)
+      # self.ignored_regions = @ignored_regions.map do |r|
+      #   self.class.convert_coordinates(r, app_output.screenshot)
+      # end unless app_output.screenshot.nil?
       @need_convert_ignored_regions_coordinates = false
     end
 
+    def convert_layout_regions_coordinates
+      return unless @need_convert_layout_regions_coordinates
+      self.layout_regions = convert_regions_coordinates(@layout_regions)
+      @need_convert_layout_regions_coordinates = false
+    end
+
+    def convert_strict_regions_coordinates
+      return unless @need_convert_strict_regions_coordinates
+      self.strict_regions = convert_regions_coordinates(@strict_regions)
+      @need_convert_strict_regions_coordinates = false
+    end
+
+    def convert_content_regions_coordinates
+      return unless @need_convert_content_regions_coordinates
+      self.content_regions = convert_regions_coordinates(@content_regions)
+      @need_convert_content_regions_coordinates = false
+    end
+
+    def convert_regions_coordinates(regions)
+      regions.dup.map { |r| self.class.convert_coordinates(r, app_output.screenshot) } unless app_output.screenshot.nil?
+    end
+
     def convert_floating_regions_coordinates
       return unless @need_convert_floating_regions_coordinates
-      self.floating_regions = @floating_regions.map do |r|
-        updated_region = app_output.screenshot.convert_region_location(
-          r,
-          Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative],
-          Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is]
-        )
-        updated_region.to_hash
-        Applitools::FloatingRegion.new(
-          updated_region.left,
-          updated_region.top,
-          r.width,
-          r.height,
-          r.max_left_offset,
-          r.max_top_offset,
-          r.max_right_offset,
-          r.max_bottom_offset
-        ).padding(r.current_padding)
-      end  unless app_output.screenshot.nil?
+      unless app_output.screenshot.nil?
+        self.floating_regions = @floating_regions.map do |r|
+          updated_region = app_output.screenshot.convert_region_location(
+            r,
+            Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative],
+            Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is]
+          )
+          updated_region.to_hash
+          Applitools::FloatingRegion.new(
+            updated_region.left,
+            updated_region.top,
+            r.width,
+            r.height,
+            r.max_left_offset,
+            r.max_top_offset,
+            r.max_right_offset,
+            r.max_bottom_offset
+          ).padding(r.current_padding)
+        end
+      end
       @need_convert_floating_regions_coordinates = false
     end
 
     def to_hash
+      if @need_convert_content_regions_coordinates
+        raise Applitools::EyesError.new(
+            'You should convert coordinates for content_regions!'
+        )
+      end
+
+      if @need_convert_strict_regions_coordinates
+        raise Applitools::EyesError.new(
+            'You should convert coordinates for strict_regions!'
+        )
+      end
+
+      if @need_convert_layout_regions_coordinates
+        raise Applitools::EyesError.new(
+            'You should convert coordinates for layout_regions!'
+        )
+      end
+
       if @need_convert_ignored_regions_coordinates
         raise Applitools::EyesError.new(
           'You should convert coordinates for ignored_regions!'

data/lib/applitools/core/match_window_task.rb

@@ -44,6 +44,9 @@ module Applitools
         match_window_data.app_output = app_output
         match_window_data.convert_ignored_regions_coordinates
         match_window_data.convert_floating_regions_coordinates
+        match_window_data.convert_layout_regions_coordinates
+        match_window_data.convert_strict_regions_coordinates
+        match_window_data.convert_content_regions_coordinates
         match_result = perform_match(match_window_data)
       else
         passed_ignore_mismatch = match_window_data.ignore_mismatch
@@ -51,6 +54,9 @@ module Applitools
         match_window_data.app_output = app_output
         match_window_data.convert_ignored_regions_coordinates
         match_window_data.convert_floating_regions_coordinates
+        match_window_data.convert_layout_regions_coordinates
+        match_window_data.convert_strict_regions_coordinates
+        match_window_data.convert_content_regions_coordinates
         match_window_data.ignore_mismatch = true
         start = Time.now
         match_result = perform_match(match_window_data)
@@ -68,6 +74,9 @@ module Applitools
           match_window_data.app_output = app_output
           match_window_data.convert_ignored_regions_coordinates
           match_window_data.convert_floating_regions_coordinates
+          match_window_data.convert_layout_regions_coordinates
+          match_window_data.convert_strict_regions_coordinates
+          match_window_data.convert_content_regions_coordinates
           match_window_data.ignore_mismatch = true
           match_result = perform_match(match_window_data)
           retry_time = Time.now - start
@@ -78,6 +87,9 @@ module Applitools
           match_window_data.app_output = app_output
           match_window_data.convert_ignored_regions_coordinates
           match_window_data.convert_floating_regions_coordinates
+          match_window_data.convert_layout_regions_coordinates
+          match_window_data.convert_strict_regions_coordinates
+          match_window_data.convert_content_regions_coordinates
           match_window_data.ignore_mismatch = passed_ignore_mismatch
           match_result = perform_match(match_window_data)
         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_core
 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: oily_png