eyes_core 3.18.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b34e0cc3a83b84a7a4a2c9548eb55ad10c8b4a
-  data.tar.gz: f017a2093422378561cd8d3236fe696816129a80
+  metadata.gz: 553af98234bc29c8a32a13494a2ba1d1ce80291e
+  data.tar.gz: 05a2259732bf2f3f5f616e654b28544e03905219
 SHA512:
-  metadata.gz: bd0fced9b70f0a10375e81dbbde7ae75cd8f0ee8f7969a176f0156a9c5323e21bb337a0d2a0eb43bd607c4af82a15ee12d8dd79e70d8965099a821fdb69ac980
-  data.tar.gz: 6a6fef3ccba6a3df74c7a0cd35886036442df8a4b1d365c13cb1a9d05eccd1efc3497653e18fdd3e49d54735472bc9e26a3718757c1ab8677fa61f3628c45ad0
+  metadata.gz: 7d4d74589c4a9feb2c0ff3d55cc3ed103a9f20424adb93e043e07fb1dc3411b06727ae89f8b729cc4bb8468e49268ee257705f441691a03a965b69ffeb237fd9
+  data.tar.gz: 1127c29cc28a924ef3c22cfb297b91c251663e29fcf6b0b4a5975ff18bcb427c51d6ea083bb0d3c18f48fa2d84203189d6b19dcb4df89dfd8db0aae18773ca95

data/lib/applitools/appium/eyes.rb

@@ -11,7 +11,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
   def initialize(*args)
     super
     self.dont_get_title = true
-    self.runner = Applitools::ClassicRunner.new
+    self.runner = Applitools::ClassicRunner.new unless runner
     self.base_agent_id = "eyes.appium.ruby/#{Applitools::VERSION}".freeze
     self.status_bar_height = 0
     self.utils = Applitools::Appium::Utils
@@ -36,6 +36,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
     self.tag_for_debug = name
     Applitools::ArgumentGuard.one_of? target, 'target', [Applitools::Selenium::Target, Applitools::Appium::Target]
 
+    return universal_check(name, target)
     return check_native(name, target) if native_app?
     super
   end

data/lib/applitools/appium/target.rb

@@ -2,207 +2,232 @@
 
 module Applitools
   module Appium
-    class Target
-      include Applitools::FluentInterface
-      attr_accessor :region_to_check, :options, :ignored_regions, :floating_regions, :layout_regions, :content_regions, :strict_regions, :accessibility_regions
-
-      class << self
-        def window
-          new
-        end
-
-        def region(*args)
-          new.region(*args)
-        end
-      end
-
-      def initialize
-        self.region_to_check = proc { Applitools::Region::EMPTY }
-        self.ignored_regions = []
-        self.floating_regions = []
-        self.layout_regions = []
-        self.content_regions = []
-        self.strict_regions = []
-        self.accessibility_regions = []
-        self.options = {}
-      end
-
-      def region(*args)
-        self.region_to_check = case args.first
-                               when ::Selenium::WebDriver::Element
-                                 proc { args.first }
-                               else
-                                 proc do |driver|
-                                   driver.find_element(*args)
-                                 end
-                               end
-        self
-      end
+    class Target < Applitools::Selenium::Target
 
       def ignore(*args)
-        requested_padding = if args.last.is_a? Applitools::PaddingBounds
-                              args.pop
-                            else
-                              Applitools::PaddingBounds::ZERO_PADDING
-                            end
-        ignored_regions <<  case (first_argument = args.first)
-                            when ::Selenium::WebDriver::Element
-                              proc do
-                                Applitools::Region
-                                  .from_location_size(first_argument.location, first_argument.size)
-                                  .padding(requested_padding)
-                              end
-                            when Applitools::Region
-                              result = first_argument.padding(requested_padding)
-                              if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
-                                def result.converted?
-                                  true
-                                end
-                              end
-                              result
-                            else
-                              proc do |driver|
-                                element = driver.find_element(*args)
-                                Applitools::Region
-                                  .from_location_size(element.location, element.size)
-                                  .padding(requested_padding)
-                              end
-                            end
-        self
-      end
-
-      def floating(*args)
-        value = case args.first
-                when Applitools::FloatingRegion
-                  args.first
-                when Applitools::Region
-                  result = Applitools::FloatingRegion.any(*args)
-                  if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
-                    def result.converted?
-                      true
-                    end
-                  end
-                  result
-                when ::Selenium::WebDriver::Element
-                  args_dup = args.dup
-                  Applitools::FloatingRegion.any(*args_dup)
-                else
-                  proc do |driver|
-                    args_dup = args.dup
-                    region = driver.find_element(args_dup.shift, args_dup.shift)
-                    Applitools::FloatingRegion.any(
-                        region, *args_dup
-                    )
-                  end
-                end
-        floating_regions << value
-        self
-      end
-
-      def layout
-        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)
-        match_level(Applitools::MatchLevel::EXACT, *args)
-      end
-
-      def accessibility(*args)
-        options = Applitools::Utils.extract_options! args
-        unless options[:type]
-          raise Applitools::EyesError,
-                'You should call Target.accessibility(region, type: type). The region_type option is required'
-        end
-        unless Applitools::AccessibilityRegionType.enum_values.include?(options[:type])
-          raise Applitools::EyesIllegalArgument,
-                "The region type should be one of [#{Applitools::AccessibilityRegionType.enum_values.join(', ')}]"
+        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') && !is_a?(Applitools::Appium::Target)
+          ignored_regions << value
         end
-
-        accessibility_regions << case args.first
-                                 when ::Selenium::WebDriver::Element
-                                   element = args.first
-                                   Applitools::AccessibilityRegion.new(
-                                     element,
-                                     options[:type]
-                                   )
-                                 when Applitools::Region
-                                   result = Applitools::AccessibilityRegion.new(
-                                       args.first, options[:type]
-                                   )
-                                   if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
-                                     def result.converted?
-                                       true
-                                     end
-                                   end
-                                   result
-                                 when String
-                                   proc do |driver|
-                                     element = driver.find_element(name_or_id: args.first)
-                                     Applitools::AccessibilityRegion.new(
-                                       element,
-                                       options[:type]
-                                     )
-                                   end
-                                 else
-                                   proc do |driver|
-                                     elements = driver.find_elements(*args)
-                                     elements.map do |e|
-                                       Applitools::AccessibilityRegion.new(
-                                         e,
-                                         options[:type]
-                                       )
-                                     end
-                                   end
-                                 end
         self
       end
 
-      def finalize
+      def region(*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') && !is_a?(Applitools::Appium::Target)
+        self.region_to_check = value
+        self.coordinate_type = Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative]
+        options[:timeout] = nil
+        reset_ignore
+        reset_floating
         self
       end
-
-      private
-
-      def process_region(*args)
-        r = args.first
-        case r
-        when ::Selenium::WebDriver::Element
-          proc do |driver|
-            Applitools::Region.from_location_size(r.location, r.size)
-          end
-        when Applitools::Region
-          if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
-            def r.converted?
-              true
-            end
-          end
-          r
-        else
-          proc do |driver|
-            element = driver.find_element(*args)
-            Applitools::Region.from_location_size(element.location, element.size)
-          end
-        end
-      end
-
+    # class Target
+    #   include Applitools::FluentInterface
+    #   attr_accessor :region_to_check, :options, :ignored_regions, :floating_regions, :layout_regions, :content_regions, :strict_regions, :accessibility_regions
+    #
+    #   class << self
+    #     def window
+    #       new
+    #     end
+    #
+    #     def region(*args)
+    #       new.region(*args)
+    #     end
+    #   end
+    #
+    #   def initialize
+    #     self.region_to_check = proc { Applitools::Region::EMPTY }
+    #     self.ignored_regions = []
+    #     self.floating_regions = []
+    #     self.layout_regions = []
+    #     self.content_regions = []
+    #     self.strict_regions = []
+    #     self.accessibility_regions = []
+    #     self.options = {}
+    #   end
+    #
+    #   def region(*args)
+    #     self.region_to_check = case args.first
+    #                            when ::Selenium::WebDriver::Element
+    #                              proc { args.first }
+    #                            else
+    #                              proc do |driver|
+    #                                driver.find_element(*args)
+    #                              end
+    #                            end
+    #     self
+    #   end
+    #
+    #   def ignore(*args)
+    #     requested_padding = if args.last.is_a? Applitools::PaddingBounds
+    #                           args.pop
+    #                         else
+    #                           Applitools::PaddingBounds::ZERO_PADDING
+    #                         end
+    #     ignored_regions <<  case (first_argument = args.first)
+    #                         when ::Selenium::WebDriver::Element
+    #                           proc do
+    #                             Applitools::Region
+    #                               .from_location_size(first_argument.location, first_argument.size)
+    #                               .padding(requested_padding)
+    #                           end
+    #                         when Applitools::Region
+    #                           result = first_argument.padding(requested_padding)
+    #                           if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    #                             def result.converted?
+    #                               true
+    #                             end
+    #                           end
+    #                           result
+    #                         else
+    #                           proc do |driver|
+    #                             element = driver.find_element(*args)
+    #                             Applitools::Region
+    #                               .from_location_size(element.location, element.size)
+    #                               .padding(requested_padding)
+    #                           end
+    #                         end
+    #     self
+    #   end
+    #
+    #   def floating(*args)
+    #     value = case args.first
+    #             when Applitools::FloatingRegion
+    #               args.first
+    #             when Applitools::Region
+    #               result = Applitools::FloatingRegion.any(*args)
+    #               if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    #                 def result.converted?
+    #                   true
+    #                 end
+    #               end
+    #               result
+    #             when ::Selenium::WebDriver::Element
+    #               args_dup = args.dup
+    #               Applitools::FloatingRegion.any(*args_dup)
+    #             else
+    #               proc do |driver|
+    #                 args_dup = args.dup
+    #                 region = driver.find_element(args_dup.shift, args_dup.shift)
+    #                 Applitools::FloatingRegion.any(
+    #                     region, *args_dup
+    #                 )
+    #               end
+    #             end
+    #     floating_regions << value
+    #     self
+    #   end
+    #
+    #   def layout
+    #     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)
+    #     match_level(Applitools::MatchLevel::EXACT, *args)
+    #   end
+    #
+    #   def accessibility(*args)
+    #     options = Applitools::Utils.extract_options! args
+    #     unless options[:type]
+    #       raise Applitools::EyesError,
+    #             'You should call Target.accessibility(region, type: type). The region_type option is required'
+    #     end
+    #     unless Applitools::AccessibilityRegionType.enum_values.include?(options[:type])
+    #       raise Applitools::EyesIllegalArgument,
+    #             "The region type should be one of [#{Applitools::AccessibilityRegionType.enum_values.join(', ')}]"
+    #     end
+    #
+    #     accessibility_regions << case args.first
+    #                              when ::Selenium::WebDriver::Element
+    #                                element = args.first
+    #                                Applitools::AccessibilityRegion.new(
+    #                                  element,
+    #                                  options[:type]
+    #                                )
+    #                              when Applitools::Region
+    #                                result = Applitools::AccessibilityRegion.new(
+    #                                    args.first, options[:type]
+    #                                )
+    #                                if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    #                                  def result.converted?
+    #                                    true
+    #                                  end
+    #                                end
+    #                                result
+    #                              when String
+    #                                proc do |driver|
+    #                                  element = driver.find_element(name_or_id: args.first)
+    #                                  Applitools::AccessibilityRegion.new(
+    #                                    element,
+    #                                    options[:type]
+    #                                  )
+    #                                end
+    #                              else
+    #                                proc do |driver|
+    #                                  elements = driver.find_elements(*args)
+    #                                  elements.map do |e|
+    #                                    Applitools::AccessibilityRegion.new(
+    #                                      e,
+    #                                      options[:type]
+    #                                    )
+    #                                  end
+    #                                end
+    #                              end
+    #     self
+    #   end
+    #
+    #   def finalize
+    #     self
+    #   end
+    #
+    #   private
+    #
+    #   def process_region(*args)
+    #     r = args.first
+    #     case r
+    #     when ::Selenium::WebDriver::Element
+    #       proc do |driver|
+    #         Applitools::Region.from_location_size(r.location, r.size)
+    #       end
+    #     when Applitools::Region
+    #       if Applitools::Appium::Utils.ios?(Applitools::Appium::Driver::AppiumLib)
+    #         def r.converted?
+    #           true
+    #         end
+    #       end
+    #       r
+    #     else
+    #       proc do |driver|
+    #         element = driver.find_element(*args)
+    #         Applitools::Region.from_location_size(element.location, element.size)
+    #       end
+    #     end
+    #   end
+    #
     end
   end
 end

data/lib/applitools/connectivity/proxy.rb

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 module Applitools::Connectivity
-  Proxy = Struct.new(:uri, :user, :password) do
+  Proxy = Struct.new(:uri, :user, :password, :is_http_only) do
+    # export type Proxy = {
+    #   url: string
+    #   username?: string
+    #   password?: string
+    #   isHttpOnly?: boolean
+    # }
     def to_hash
       result = {}
-      result[:uri] = uri.is_a?(URI) ? uri : URI(uri)
-      result[:user] = user unless user.nil?
+      result[:url] = uri.is_a?(String) ? uri : uri.to_s
+      result[:username] = user unless user.nil?
       result[:password] = password unless password.nil?
+      result[:isHttpOnly] = !!is_http_only unless is_http_only.nil?
       result
     end
 
@@ -19,3 +26,4 @@ module Applitools::Connectivity
     end
   end
 end
+# U-Notes : add is_http_only/isHttpOnly flag

data/lib/applitools/connectivity/server_connector.rb

@@ -167,7 +167,7 @@ module Applitools::Connectivity
       Oj.load(response.body)
     end
 
-    def download_resource(url, ua_string = nil)
+    def download_resource(url, ua_string = nil, cookies=nil)
       Applitools::EyesLogger.debug "Fetching #{url}..."
       resp_proc = proc do |u|
         faraday_connection(u, false).send(:get) do |req|
@@ -175,6 +175,7 @@ module Applitools::Connectivity
           req.headers[:accept_encoding] = 'identity'
           req.headers[:accept_language] = '*'
           req.headers[:user_agent] = ua_string if ua_string
+          req.headers[:Cookie] = cookies.map { |h| [h[:name], h[:value]].join('=') }.join('; ') unless cookies.to_a.empty?
         end
       end
       response = resp_proc.call(url)
@@ -309,10 +310,11 @@ module Applitools::Connectivity
     private
 
     def faraday_connection(url, pass_user_agent_header = true)
+      raise Applitools::NotUniversalServerRequestError.new(url)
       Faraday.new(
         url: url,
         ssl: { ca_file: SSL_CERT },
-        proxy: @proxy.nil? ? nil : @proxy.to_hash
+        proxy: @proxy.nil? ? nil : {uri: @proxy.uri}
       ) do |faraday|
         if pass_user_agent_header
           faraday.use(

data/lib/applitools/core/accessibility_level.rb

@@ -42,5 +42,16 @@ module Applitools
     def json_data
       to_h
     end
+
+    # accessibilitySettings?: {
+    #   level?: AccessibilityLevel
+    #   guidelinesVersion?: AccessibilityGuidelinesVersion
+    # }
+    def to_hash
+      {
+        level: level,
+        guidelinesVersion: version
+      }
+    end
   end
 end

data/lib/applitools/core/batch_info.rb

@@ -4,6 +4,8 @@ require 'securerandom'
 require 'applitools/utils/utils'
 require_relative 'helpers'
 
+PROCESS_DEFAULT_BATCH_ID = SecureRandom.uuid # Unique per-process
+
 module Applitools
   class BatchInfo
     extend Helpers
@@ -30,7 +32,7 @@ module Applitools
       if id
         self.id = id
       elsif self.id.nil? || self.id.empty?
-        self.id = SecureRandom.uuid
+        self.id = PROCESS_DEFAULT_BATCH_ID
       end
       self.properties = properties if properties
       self.notify_on_completion = 'true'.casecmp(env_notify_on_completion || '') == 0 ? true : false
@@ -47,8 +49,27 @@ module Applitools
       }
     end
 
+    # export type Batch = {
+    #   id?: string
+    #   name?: string
+    #   sequenceName?: string
+    #   startedAt?: Date | string
+    #   notifyOnCompletion?: boolean
+    #   properties?: CustomProperty[]
+    # }
+    # export type CustomProperty = {
+    #   name: string
+    #   value: string
+    # }
     def to_hash
-      json_data
+      {
+        id: id,
+        name: name, # 'Ruby Coverage Tests',
+        startedAt: @started_at.iso8601,
+        sequenceName: sequence_name,
+        notifyOnCompletion: notify_on_completion,
+        properties: properties
+      }.compact
     end
 
     def to_s
@@ -56,3 +77,4 @@ module Applitools
     end
   end
 end
+# U-Notes : change 'batchSequenceName' to 'sequenceName'

data/lib/applitools/core/classic_runner.rb

@@ -29,11 +29,18 @@ module Applitools
       ensure
         delete_all_batches
       end
-      all_test_results
+      return all_test_results unless all_test_results.empty?
+      all_universal_results = close_all_eyes
+      key_transformed_results = Applitools::Utils.deep_stringify_keys(all_universal_results)
+      key_transformed_results.map {|result| Applitools::TestResults.new(result) }
     end
 
     def rendering_info(connector)
       @rendering_info ||= RenderingInfo.new(connector.rendering_info)
     end
+
+    def universal_eyes_manager_config
+      Applitools::UniversalEyesManagerConfig.classic
+    end
   end
 end