eyes_core 4.5.0.alpha → 4.5.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7a7954467752a70c0d4f461440fd757e5152569db10f88268e13b63a287982
-  data.tar.gz: '08eb391d5a2aa367873fe596c9adedfafaf195cec3cc70fc4203f303d083ae02'
+  metadata.gz: fb4470a9e790799f337bf3649c9d1d815b78933e1cdd394e14f02c1fcb1e9707
+  data.tar.gz: 8a54d18a05cafc611d51b689dcf3b47db26e7ee8c7be1fec3ff2e77b007ed2f2
 SHA512:
-  metadata.gz: d0089cdebd1f02bb2e721ead00c0e321a334e79a0db516d45ad7a2b7d65f1862cb232d1a716212bc867eeda45fe4088b1e033bcc72531f6ff9b19a9c51699034
-  data.tar.gz: 9840236d2db173ba8c903fc495e0e332743483c36be2c5f8a59293b86c5514f23e2315b880eb4eefd43693fac3f8e585e1436bf3b276ff7f31c8635f99176494
+  metadata.gz: 9bbb9b54179c3d535a981e26d5ddfde2bc88be6e378074b635ff7796c2cf1ffa1b176b5d74a35e9b03b0d6d9e9ce6241149e92ccaf2b81e33ac59bb81f7e9568
+  data.tar.gz: 7052cf337483264abfaf9d495c3f6a6c83381266ae17cde752c589c193df264afd72f82178077400bbd67ac1b72f58e446a741046c793f06dbcf83c48e8f67fe

data/lib/applitools/core/match_level.rb

@@ -8,11 +8,12 @@ module Applitools
     LAYOUT1 = 'Layout1'.freeze
     LAYOUT2 = 'Layout2'.freeze
     CONTENT = 'Content'.freeze
+    IGNORE_COLORS = 'IgnoreColors'.freeze
     STRICT = 'Strict'.freeze
     EXACT = 'Exact'.freeze
 
     def enum_values
-      [NONE, LAYOUT, LAYOUT1, LAYOUT2, CONTENT, STRICT, EXACT]
+      [NONE, LAYOUT, LAYOUT1, LAYOUT2, CONTENT, IGNORE_COLORS, STRICT, EXACT]
     end
   end
 end

data/lib/applitools/core/universal_eyes_checks.rb

@@ -13,9 +13,11 @@ module Applitools
 
       raise Applitools::EyesNotOpenException.new('Eyes not open!') if @universal_eyes.nil?
       Applitools::EyesLogger.logger.info "#{test_name} : check(#{name}) started  ..."
+      settings = get_universal_check_settings(name, target)
+      image_target = settings[:image].nil? ? {} : { image: settings.delete(:image) }
       # require 'pry'
       # binding.pry
-      check_result = @universal_eyes.check(get_universal_check_settings(name, target))
+      check_result = @universal_eyes.check(settings, image_target)
       if server_error?(check_result)
         # require 'pry'
         # binding.pry
@@ -29,6 +31,7 @@ module Applitools
       end
 
       logger.info 'Done!'
+      result
     end
 
     private

data/lib/applitools/core/universal_eyes_open.rb

@@ -18,17 +18,19 @@ module Applitools
     #   trigger recording and frame handling
     def universal_open(options = {})
       original_driver = options.delete(:driver)
-      Applitools::ArgumentGuard.not_nil original_driver, 'options[:driver]'
+      if self.class.name != 'Applitools::Images::Eyes'
+        Applitools::ArgumentGuard.not_nil original_driver, 'options[:driver]'
 
-      if respond_to?(:disabled?) && disabled?
-        logger.info('Ignored')
-        return original_driver
-      end
+        if respond_to?(:disabled?) && disabled?
+          logger.info('Ignored')
+          return original_driver
+        end
 
-      self.driver = Applitools::Selenium::SeleniumEyes.eyes_driver(original_driver, self)
+        self.driver = Applitools::Selenium::SeleniumEyes.eyes_driver(original_driver, self)
+      end
 
       update_config_from_options(options)
-      universal_driver_config = driver.universal_driver_config
+      universal_driver_config = driver.universal_driver_config if self.class.name != 'Applitools::Images::Eyes'
       universal_eyes_manager = runner.get_universal_eyes_manager
 
       universal_eyes_config = Applitools::UniversalEyesConfig.new
@@ -42,7 +44,11 @@ module Applitools
 
       self.open = true if respond_to?(:open=, true)
       self.running_session = true if respond_to?(:running_session=, true)
-      driver
+      if self.class.name != 'Applitools::Images::Eyes'
+        driver
+      else
+        self.open?
+      end
     rescue Applitools::EyesError => e
       logger.error e.message
       raise e

data/lib/applitools/core/universal_new_api.rb

@@ -9,7 +9,9 @@ module Applitools
     #   minMatch?: number
     #   language?: string
     # }
-    def extract_text(targets_array)
+    def extract_text(*args)
+      image_target = args[0].is_a?(Hash) ? args[0] : nil
+      targets_array = args[0].is_a?(Hash) ? args[1].to_a : args[0]
       targets_array.map do |target|
         target['target'] = { elementId: target['target'].ref } if target['target'].is_a?(::Selenium::WebDriver::Element)
         target['target']['x'] = target['target'].delete('left') if target['target']['left']
@@ -17,7 +19,7 @@ module Applitools
         target[:region] = target.delete('target')
         target
       end
-      driver_target = driver.universal_driver_config
+      driver_target = respond_to?(:driver) ? driver.universal_driver_config : image_target
       universal_eyes.extract_text(targets_array, driver_target)
     end
 
@@ -29,7 +31,7 @@ module Applitools
     #   language?: string
     # }
     def extract_text_regions(patterns_array)
-      driver_target = driver.universal_driver_config
+      driver_target = respond_to?(:driver) ? driver.universal_driver_config : { image: patterns_array.delete('image') }
       results = universal_eyes.extract_text_regions(patterns_array, driver_target)
       Applitools::Utils.deep_stringify_keys(results)
     end

data/lib/applitools/universal_sdk/universal_check_settings.rb

@@ -84,6 +84,15 @@ module Applitools
     json_fields :ufgOptions,
                 :userCommandId
 
+    # ImageTarget
+    json_fields :image
+                # :name,
+                # :source,
+                # :dom,
+                # :locationInViewport,
+                # :locationInView,
+                # :fullViewSize
+
     def initialize(*args)
       options = Applitools::Utils.extract_options! args
       options.keys.select {|k| options[k] && respond_to?("#{k}=") }.each {|k| send("#{k}=", options[k]) }
@@ -104,6 +113,7 @@ module Applitools
     def from_original_target(target, eyes)
       # require('pry')
       # binding.pry
+      return from_eyes_images(target, eyes) if eyes.class.name === 'Applitools::Images::Eyes'
 
       self.accessibility_settings = eyes.accessibility_validation
       self.disable_browser_fetching = eyes.dont_fetch_resources
@@ -166,11 +176,37 @@ module Applitools
       self.visual_grid_options = from_target_options_or_eyes(:visual_grid_options, target.options, eyes)
       self.ufg_options = self.visual_grid_options
       self.user_command_id = self.variation_group_id
+
+      self.image = target.image if target.respond_to?(:image)
     # rescue => e
     #   require('pry')
     #   binding.pry
     end
 
+    def from_eyes_images(target, eyes)
+      self.accessibility_settings = eyes.accessibility_validation
+      self.disable_browser_fetching = eyes.dont_fetch_resources
+      self.accessibility_regions = target.accessibility_regions
+      self.floating_regions = target.floating_regions
+
+      self.ignore_regions = target.ignored_regions.map do |ir|
+        ir.is_a?(Proc) ? normalize_element_selector(ir.call(eyes.driver)) : ir
+      end
+
+      if target.region_to_check.is_a?(Hash)
+        self.region = target.region_to_check
+      elsif target.region_to_check.is_a?(String)
+        self.region = target.region_to_check
+      elsif target.region_to_check.is_a?(Proc)
+        el = target.region_to_check.call(eyes.driver)
+        self.region = normalize_element_selector(el) unless el.respond_to?(:empty?) && el.empty?
+      end
+
+      self.exact = (target.options[:exact] && target.options[:exact].to_hash) || (eyes.exact && eyes.exact.to_hash)
+
+      self.image = target.image
+    end
+
     def to_hash
       json_data.compact.reject do |_, v|
         case v

data/lib/applitools/universal_sdk/universal_client.rb

@@ -157,7 +157,7 @@ module Applitools::Connectivity
       command_with_result(EYES_MANAGER_CLOSE_ALL_EYES, {manager: manager, config: commands_config})
     end
 
-    def eyes_check(eyes, settings)
+    def eyes_check(eyes, settings, image_target = {})
       # interface CheckRequestPayload {
       #   eyes: Ref<Eyes>
       #   target?: ImageTarget | DriverTarget
@@ -166,7 +166,9 @@ module Applitools::Connectivity
       # }
       #
       # type CheckResponsePayload = CheckResult[]
-      command_with_result(EYES_CHECK, {eyes: eyes, settings: settings, config: commands_config})
+      payload = {eyes: eyes, settings: settings, config: commands_config}
+      payload[:target] = image_target unless image_target.empty?
+      command_with_result(EYES_CHECK, payload)
     end
 
     def eyes_locate(eyes, settings, driver_target)
@@ -192,7 +194,9 @@ module Applitools::Connectivity
       # }
       #
       # type LocateTextResponcePayload = Record<string, Array<{text: string, x: number, y: number, width: number, hieght: number}>>
-      command_with_result(EYES_EXTRACT_TEXT_REGIONS, {eyes: eyes, settings: settings, config: commands_config})
+      payload = {eyes: eyes, target: driver_target, settings: settings, config: commands_config}
+      payload.delete(:target) if driver_target.nil? || driver_target.empty?
+      command_with_result(EYES_EXTRACT_TEXT_REGIONS, payload)
     end
 
     def eyes_extract_text(eyes, regions, driver_target)
@@ -204,7 +208,9 @@ module Applitools::Connectivity
       # }
       #
       # type ExtractTextResponcePayload = string[]
-      command_with_result(EYES_EXTRACT_TEXT, {eyes: eyes, settings: regions, config: commands_config})
+      payload = {eyes: eyes, target: driver_target, settings: regions, config: commands_config}
+      payload.delete(:settings) if regions.empty?
+      command_with_result(EYES_EXTRACT_TEXT, payload)
     end
 
     def eyes_close(eyes)

data/lib/applitools/universal_sdk/universal_eyes.rb

@@ -11,10 +11,10 @@ module Applitools
       @universal_client = universal_client
     end
 
-    def check(settings)
+    def check(settings, image_target = {})
       elapsed_time_start = Time.now
       # Applitools::EyesLogger.logger.debug "check settings: #{settings}"
-      check_result = @universal_client.eyes_check(@eyes, settings)
+      check_result = @universal_client.eyes_check(@eyes, settings, image_target)
       # Applitools::EyesLogger.logger.debug "check_result: #{check_result}"
       Applitools::EyesLogger.logger.info "Completed in #{format('%.2f', Time.now - elapsed_time_start)} seconds"
       check_result

data/lib/applitools/universal_sdk/universal_eyes_config.rb

@@ -166,8 +166,27 @@ module Applitools
       end
     end
 
+    def from_eyes_images
+      FROM_ORIGINAL_EYES - [
+        :browsers_info,
+        :concurrent_sessions,
+        :debug_screenshots,
+        :force_full_page_screenshot,
+        :hide_caret,
+        :hide_scrollbars,
+        :send_dom,
+        :stitch_mode,
+        :visual_grid_options,
+        :wait_before_screenshots,
+        :wait_before_capture,
+        :stitching_overlap
+      ]
+
+    end
+
     def from_original_sdk(original_eyes)
-      FROM_ORIGINAL_EYES.each {|m| copy_from(m, original_eyes) }
+      from_eyes = original_eyes.class.name != 'Applitools::Images::Eyes' ? FROM_ORIGINAL_EYES : from_eyes_images
+      from_eyes.each {|m| copy_from(m, original_eyes) }
       self.agent_id = original_eyes.base_agent_id if original_eyes.respond_to?(:base_agent_id)
       self.agent_id = original_eyes.full_agent_id if original_eyes.respond_to?(:full_agent_id)
       # self.display_name = original_eyes.app_name

data/lib/applitools/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.5.0.alpha'.freeze
+  VERSION = '4.5.0.beta'.freeze
+  IMAGES_VERSION = '4.0.0.alpha'.freeze
   UNIVERSAL_VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 4.5.0.alpha
+  version: 4.5.0.beta
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday