eyes_core 3.15.35 → 3.15.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8caebc0e5dcc9674a057eafc8b94526b1fe5474116941cef3c739d43ea75ae3a
-  data.tar.gz: 3dbcee8777b44102d749caf42cf1d62986b4c6fbef2122a9344d1b7c445cadc0
+  metadata.gz: e83ac161c7c438799a4d6d8a5179d6444b3e2fa0b2c9514008a442803d864ff6
+  data.tar.gz: 6adcc0d17224d03b32bf26158d47feb3e85aa92c188c2e7527628e791382ddd2
 SHA512:
-  metadata.gz: 1759415ac403bb615a61585d429d26511edf656728186c94b45227f780a3d656ce5aa0b1cf8f8a91b4490874f95223a27bfda2928f8053dae82d775dc32087c1
-  data.tar.gz: b51243ce7a727827d17d856613f13bc0d626565c6b7e1f897dd5ce60a0b72f86b0dd81b19ed0b1b9d02c34e0e2c3aca48f6c7d1047c81105bbf24bc657dcbf44
+  metadata.gz: 6a7eb31c2124376db45cadaa7cfb0efe9ba5cee9181139143254bf733480a0a08a09995d25a62ccc0202f63ae5596f2ed470d386d164d99b35f16030a33bcb91
+  data.tar.gz: b2a46e55eda62ff8845cddc7995da6f3cc5642eef6481a0e9ebe73f3636269aa429e938ed51d74706a1e84e0a870c9f23168483f809e490c3c8199b823afb2e8

data/lib/applitools/connectivity/server_connector.rb

@@ -140,6 +140,7 @@ module Applitools::Connectivity
 
     def match_window(session, data)
       # Notice that this does not include the screenshot.
+      puts data.to_hash
       json_data = Oj.dump(Applitools::Utils.camelcase_hash_keys(data.to_hash)).force_encoding('BINARY')
       body = [json_data.length].pack('L>') + json_data + data.screenshot
       Applitools::EyesLogger.debug 'Sending match data...'

data/lib/applitools/core/accessibility_level.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Applitools
+  module AccessibilityLevel
+    extend self
+    NONE = 'None'
+    AA = 'AA'
+    AAA = 'AAA'
+
+    def enum_values
+      [NONE, AA, AAA]
+    end
+  end
+end

data/lib/applitools/core/accessibility_region.rb

@@ -0,0 +1,23 @@
+require_relative 'region'
+
+module Applitools
+  class AccessibilityRegion < ::Applitools::Region
+    attr_accessor :region_type
+    def initialize(element, region_type)
+      super(element.location.x, element.location.y, element.size.width, element.size.height)
+      self.region_type = region_type
+    end
+
+    def to_hash
+      super.merge(type: region_type)
+    end
+
+    def with_padding
+      self
+    end
+
+    def ==(other)
+      super && region_type == other.region_type
+    end
+  end
+end

data/lib/applitools/core/accessibility_region_type.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Applitools
+  module AccessibilityRegionType
+    extend self
+
+    NONE = 'None'
+    IGNORE_CONTRAST = 'IgnoreContrast'
+    REGULAR_TEXT = 'RegularText'
+    LARGE_TEXT = 'LargeText'
+    BOLD_TEXT = 'BoldText'
+    GRAPHICAL_OBJECT = 'GraphicalObject'
+
+    def enum_values
+      [
+        NONE,
+        IGNORE_CONTRAST,
+        REGULAR_TEXT,
+        LARGE_TEXT,
+        BOLD_TEXT,
+        GRAPHICAL_OBJECT
+      ]
+    end
+  end
+end

data/lib/applitools/core/eyes_screenshot.rb

@@ -35,12 +35,22 @@ module Applitools
     def convert_region_location(region, from, to)
       Applitools::ArgumentGuard.not_nil region, 'region'
       Applitools::ArgumentGuard.is_a? region, 'region', Applitools::Region
-      return Region.new(0, 0, 0, 0) if region.empty?
+      if region.empty?
+        return region.dup.tap do |r|
+          r.left = 0
+          r.top = 0
+          r.width = 0
+          r.height = 0
+        end
+      end
       Applitools::ArgumentGuard.not_nil from, 'from'
       Applitools::ArgumentGuard.not_nil to, 'to'
 
       updated_location = convert_location(region.location, from, to)
-      Region.new updated_location.x, updated_location.y, region.width, region.height
+      region.dup.tap do |r|
+        r.left = updated_location.x
+        r.top = updated_location.y
+      end
     end
 
     private

data/lib/applitools/core/match_window_data.rb

@@ -19,11 +19,13 @@ module Applitools
             'Name' => nil,
             'UserInputs' => [],
             'ImageMatchSettings' => {
+              'accessibilityLevel' => 'None',
               'MatchLevel' => 'Strict',
               'SplitTopHeight' => 0,
               'SplitBottomHeight' => 0,
               'IgnoreCaret' => true,
               'IgnoreDisplacements' => false,
+              'Accessibility' => [],
               'Ignore' => [],
               'Floating' => [],
               'Layout' => [],
@@ -86,6 +88,7 @@ module Applitools
       @need_convert_strict_regions_coordinates = false
       @need_convert_content_regions_coordinates = false
       @need_convert_layout_regions_coordinates = false
+      @need_convert_accessibility_regions_coordinates = false
     end
 
     def screenshot
@@ -145,6 +148,13 @@ module Applitools
       end
     end
 
+    def accessibility_regions=(value)
+      Applitools::ArgumentGuard.is_a? value, 'value', Array
+      value.each do |r|
+        current_data['Options']['ImageMatchSettings']['Accessibility'] << 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
@@ -267,9 +277,33 @@ module Applitools
         @content_regions = obtain_regions_coordinates(target.content_regions, driver)
         @need_convert_content_regions_coordinates = true unless @content_regions.empty?
       end
+
+      if target.respond_to? :accessibility_regions
+        @accessibility_regions = obtain_accessibility_regions_coordinates(target.accessibility_regions, driver)
+        @need_convert_accessibility_regions_coordinates = true unless @accessibility_regions.empty?
+      end
       target
     end
 
+    def obtain_accessibility_regions_coordinates(regions, driver)
+      result = []
+      regions.each do |r|
+        case r
+        when Proc
+          region_or_regions = r.call(driver)
+          case region_or_regions
+          when Array
+            result.concat(region_or_regions)
+          when Applitools::AccessibilityRegion
+            result << region_or_regions
+          end
+        else
+          raise Applitools::EyesError, 'Error getting accessibility_regions coordinates'
+        end
+      end
+      result
+    end
+
     def obtain_regions_coordinates(regions, driver)
       result = []
       regions.each do |r|
@@ -306,6 +340,14 @@ module Applitools
       current_data['Options']['ImageMatchSettings']['IgnoreCaret'] = value
     end
 
+    def accessibility_validation
+      current_data['Options']['ImageMatchSettings']['AccessibilityLevel']
+    end
+
+    def accessibility_validation=(value)
+      current_data['Options']['ImageMatchSettings']['AccessibilityLevel'] = value
+    end
+
     def convert_ignored_regions_coordinates
       return unless @need_convert_ignored_regions_coordinates
       self.ignored_regions = convert_regions_coordinates(@ignored_regions)
@@ -333,6 +375,12 @@ module Applitools
       @need_convert_content_regions_coordinates = false
     end
 
+    def convert_accessibility_regions_coordinates
+      return unless @need_convert_accessibility_regions_coordinates
+      self.accessibility_regions = convert_regions_coordinates(@accessibility_regions)
+      @need_convert_accessibility_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
@@ -363,6 +411,12 @@ module Applitools
     end
 
     def to_hash
+      if @need_convert_accessibility_regions_coordinates
+        raise Applitools::EyesError.new(
+            'You should convert coordinates for content_regions!'
+        )
+      end
+
       if @need_convert_content_regions_coordinates
         raise Applitools::EyesError.new(
             'You should convert coordinates for content_regions!'

data/lib/applitools/core/match_window_task.rb

@@ -47,6 +47,7 @@ module Applitools
         match_window_data.convert_layout_regions_coordinates
         match_window_data.convert_strict_regions_coordinates
         match_window_data.convert_content_regions_coordinates
+        match_window_data.convert_accessibility_regions_coordinates
         match_result = perform_match(match_window_data)
       else
         passed_ignore_mismatch = match_window_data.ignore_mismatch
@@ -57,6 +58,7 @@ module Applitools
         match_window_data.convert_layout_regions_coordinates
         match_window_data.convert_strict_regions_coordinates
         match_window_data.convert_content_regions_coordinates
+        match_window_data.convert_accessibility_regions_coordinates
         match_window_data.ignore_mismatch = true
         start = Time.now
         match_result = perform_match(match_window_data)
@@ -77,6 +79,7 @@ module Applitools
           match_window_data.convert_layout_regions_coordinates
           match_window_data.convert_strict_regions_coordinates
           match_window_data.convert_content_regions_coordinates
+          match_window_data.convert_accessibility_regions_coordinates
           match_window_data.ignore_mismatch = true
           match_result = perform_match(match_window_data)
           retry_time = Time.now - start
@@ -90,6 +93,7 @@ module Applitools
           match_window_data.convert_layout_regions_coordinates
           match_window_data.convert_strict_regions_coordinates
           match_window_data.convert_content_regions_coordinates
+          match_window_data.convert_accessibility_regions_coordinates
           match_window_data.ignore_mismatch = passed_ignore_mismatch
           match_result = perform_match(match_window_data)
         end

data/lib/applitools/core/padding_bounds.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'argument_guard'
 module Applitools
   class PaddingBounds
     attr_accessor :padding_left, :padding_top, :padding_right, :padding_bottom

data/lib/applitools/core/test_results.rb

@@ -42,6 +42,14 @@ module Applitools
       original_results['isAborted']
     end
 
+    def api_session_url
+      original_results['apiUrls']['session']
+    end
+
+    def secret_token
+      original_results['secretToken']
+    end
+
     def ==(other)
       if other.is_a? self.class
         result = true

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.15.35
+  version: 3.15.36
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -259,6 +259,9 @@ files:
 - lib/applitools/connectivity/server_connector.rb
 - lib/applitools/core/abstract_configuration.rb
 - lib/applitools/core/abstract_region.rb
+- lib/applitools/core/accessibility_level.rb
+- lib/applitools/core/accessibility_region.rb
+- lib/applitools/core/accessibility_region_type.rb
 - lib/applitools/core/app_environment.rb
 - lib/applitools/core/app_output.rb
 - lib/applitools/core/app_output_with_screenshot.rb