eyes_core 4.0.2 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a4242f3c4b1abc7dfc40017e842bd62ffff201
-  data.tar.gz: 60c91ce7eaa4204cd9679f84e7241625720fb016
+  metadata.gz: 594c8d4219a36eebaef4d76310a8c9525235891d
+  data.tar.gz: f098d430a1c294deb84141dd2b8fb2c8505e0b01
 SHA512:
-  metadata.gz: 61e53f261d8dfc5b881b701cb496068c556b22c749cab6943a4ba3a7ab14af00be33a93b1bad27f5cdefe24ce06c39406ff7b97f9e5777305673705a07f182af
-  data.tar.gz: e403debe4f47c24a17e3feb9ce9583a8b4504f3fec0578b5131693dce22221a2835c45d9da3480c7799f9a7d3bcc5cd908c2f61b8f2ec3e665be96c96e5074c3
+  metadata.gz: 6442028a1b2f6eee6c86538d50c4272310f8ec9928216deee68062f93b7e89b0d9df9a342affcd7aa996faba44128d43227e8b32f0b917e522753a0dc08daffd
+  data.tar.gz: 842eb9c9fab4f64621a7d15f508112c20ade9f80f04c4eb34c84f180a8c19a3140c8ef04bd71e23ddb7dd2d22b412c2b4adb6ac748c63235530505519e316918

data/lib/applitools/appium/eyes.rb

@@ -84,8 +84,8 @@ class Applitools::Appium::Eyes < Applitools::Selenium::SeleniumEyes
         self.screenshot = screenshot_class.new(
           Applitools::Screenshot.from_image(
             case scaled_image
-            when ChunkyPNG::Image
-              scaled_image
+            # when ChunkyPNG::Image
+            #   scaled_image
             when Applitools::Screenshot::Datastream
               scaled_image.image
             else

data/lib/applitools/calabash/calabash_screenshot_provider.rb

@@ -44,19 +44,19 @@ module Applitools
       def capture_screenshot(options = {})
         sleep WAIT_BEFORE_SCREENSHOT
         result = nil
-        Applitools::Calabash::Utils.using_screenshot(context) do |screenshot_path|
-          screenshot = ::ChunkyPNG::Image.from_file(screenshot_path)
-          save_debug_screenshot(screenshot, ['original', options[:debug_suffix]])
-          viewport_size = Applitools::Calabash::EyesSettings.instance.viewport_size
-          screenshot.crop!(0, 0, viewport_size[:width], viewport_size[:height])
-          save_debug_screenshot(screenshot, ['cropped', options[:debug_suffix]])
-          result = Applitools::Calabash::EyesCalabashAndroidScreenshot.new(
-            Applitools::Screenshot.from_image(
-              screenshot
-            ),
-            density: density
-          )
-        end
+        # Applitools::Calabash::Utils.using_screenshot(context) do |screenshot_path|
+        #   screenshot = ::ChunkyPNG::Image.from_file(screenshot_path)
+        #   save_debug_screenshot(screenshot, ['original', options[:debug_suffix]])
+        #   viewport_size = Applitools::Calabash::EyesSettings.instance.viewport_size
+        #   screenshot.crop!(0, 0, viewport_size[:width], viewport_size[:height])
+        #   save_debug_screenshot(screenshot, ['cropped', options[:debug_suffix]])
+        #   result = Applitools::Calabash::EyesCalabashAndroidScreenshot.new(
+        #     Applitools::Screenshot.from_image(
+        #       screenshot
+        #     ),
+        #     density: density
+        #   )
+        # end
         result
       end
     end
@@ -66,16 +66,16 @@ module Applitools
       def capture_screenshot(options = {})
         sleep WAIT_BEFORE_SCREENSHOT
         result = nil
-        Applitools::Calabash::Utils.using_screenshot(context) do |screenshot_path|
-          screenshot = ::ChunkyPNG::Image.from_file(screenshot_path)
-          save_debug_screenshot(screenshot, options[:debug_suffix])
-          result = Applitools::Calabash::EyesCalabashIosScreenshot.new(
-            Applitools::Screenshot.from_image(
-              screenshot
-            ),
-            scale_factor: density
-          )
-        end
+        # Applitools::Calabash::Utils.using_screenshot(context) do |screenshot_path|
+        #   screenshot = ::ChunkyPNG::Image.from_file(screenshot_path)
+        #   save_debug_screenshot(screenshot, options[:debug_suffix])
+        #   result = Applitools::Calabash::EyesCalabashIosScreenshot.new(
+        #     Applitools::Screenshot.from_image(
+        #       screenshot
+        #     ),
+        #     scale_factor: density
+        #   )
+        # end
         result
       end
     end

data/lib/applitools/calabash/full_page_capture_algorithm/base.rb

@@ -30,7 +30,7 @@ module Applitools
 
         def create_entire_image
           current_entire_size = entire_size
-          @stitched_image = ::ChunkyPNG::Image.new(current_entire_size.width, current_entire_size.height)
+          # @stitched_image = ::ChunkyPNG::Image.new(current_entire_size.width, current_entire_size.height)
         end
 
         def entire_content

data/lib/applitools/core/batch_info.rb

@@ -35,7 +35,9 @@ module Applitools
         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
+      unless env_notify_on_completion.nil?
+        self.notify_on_completion = 'true'.casecmp(env_notify_on_completion || '') == 0 ? true : false
+      end
     end
 
     def json_data

data/lib/applitools/core/classic_runner.rb

@@ -31,8 +31,9 @@ module Applitools
       end
       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) }
+      test_result_summary = Applitools::TestResultSummary.new(all_universal_results).old_style_results_array
+      return [] if test_result_summary.reject { |tr| tr.aborted? }.empty?
+      test_result_summary
     end
 
     def rendering_info(connector)

data/lib/applitools/core/debug_screenshot_provider.rb

@@ -13,12 +13,12 @@ module Applitools
     def save(image, suffix = '')
       return unless debug
       case image
-      when ::ChunkyPNG::Image, Applitools::Screenshot
+      when Applitools::Screenshot
         image.save(file_name_to_save(suffix)) if image.area > 0
       when Applitools::EyesScreenshot
         image.image.save(file_name_to_save(suffix)) if image.image.area > 0
-      when String
-        ::ChunkyPNG::Image.from_string(image).save(file_name_to_save(suffix))
+      # when String
+      #   ::ChunkyPNG::Image.from_string(image).save(file_name_to_save(suffix))
       else
         return
       end

data/lib/applitools/core/eyes_base.rb

@@ -456,7 +456,8 @@ module Applitools
       # binding.pry
       key_transformed_results = Applitools::Utils.deep_stringify_keys(universal_results)
       results = key_transformed_results.map {|result| Applitools::TestResults.new(result) }
-      results = results.first if results.size == 1
+      results = results.first if results.size >= 1
+
       session_results_url = results.url
       # results = server_connector.stop_session running_session, false, save
       runner.aggregate_result(results) if runner

data/lib/applitools/core/eyes_runner.rb

@@ -27,5 +27,23 @@ module Applitools
     def close_all_eyes
       get_universal_eyes_manager.close_all_eyes
     end
+
+    # def close_batch(batch_id)
+    #   if 'true'.casecmp(ENV['APPLITOOLS_DONT_CLOSE_BATCHES'] || '') == 0
+    #     return Applitools::EyesLogger.info(
+    #       'APPLITOOLS_DONT_CLOSE_BATCHES environment variable set to true. Doing nothing.'
+    #     ) && false
+    #   end
+    #   Applitools::ArgumentGuard.not_nil(batch_id, 'batch_id')
+    #   Applitools::EyesLogger.info("Close batch called with #{batch_id}")
+    #
+    #   close_batches_result = universal_client.core_close_batches(batch_id)
+    #   if close_batches_result.is_a?(Hash) && close_batches_result[:message] && close_batches_result[:stack]
+    #     Applitools::EyesLogger.logger.debug "Eyes close Batch: #{close_batches_result[:message]}"
+    #     Applitools::EyesLogger.logger.debug "Stack for #{Applitools::Connectivity::UniversalClient::CORE_CLOSE_BATCHES} : #{close_batches_result[:stack]}"
+    #   else
+    #     Applitools::EyesLogger.info "delete batch is done with #{close_batches_result}"
+    #   end
+    # end
   end
 end

data/lib/applitools/core/screenshot.rb

@@ -5,7 +5,7 @@ module Applitools
   class Screenshot < Delegator
     class << self
       def from_region(region)
-        self::Image.new(::ChunkyPNG::Image.new(region.width, region.height))
+        # self::Image.new(::ChunkyPNG::Image.new(region.width, region.height))
       end
 
       def from_datastream(datastream)
@@ -18,7 +18,7 @@ module Applitools
 
       def from_any_image(image)
         return from_region(image) if image.is_a? Applitools::Region
-        return from_image(image) if image.is_a? ::ChunkyPNG::Image
+        # return from_image(image) if image.is_a? ::ChunkyPNG::Image
         return image if image.is_a?(Image) | image.is_a?(Datastream)
         from_datastream(image)
       end
@@ -60,12 +60,12 @@ module Applitools
             "Expected image to be Datastream or String, but got #{image.class}"
           )
         end
-        @datastream = ::ChunkyPNG::Datastream.from_string image
+        # @datastream = ::ChunkyPNG::Datastream.from_string image
       end
 
       def update!(image)
         Applitools::ArgumentGuard.not_nil(image, 'image')
-        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        # Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
         @datastream = image.to_datastream
         self
       end
@@ -90,7 +90,7 @@ module Applitools
       end
 
       def restore
-        ::ChunkyPNG::Image.from_datastream @datastream
+        # ::ChunkyPNG::Image.from_datastream @datastream
       end
 
       def sha256
@@ -103,13 +103,13 @@ module Applitools
 
       def initialize(image)
         Applitools::ArgumentGuard.not_nil(image, 'image')
-        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        # Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
         @image = image
       end
 
       def update!(image)
         Applitools::ArgumentGuard.not_nil(image, 'image')
-        Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+        # Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
         @image = image
       end
 

data/lib/applitools/core/test_result_summary.rb

@@ -3,10 +3,23 @@
 module Applitools
   class TestResultSummary
     attr_accessor :results, :passed, :unresolved, :failed, :exceptions, :mismatches, :missing, :matches
-    def initialize(results)
-      Applitools::ArgumentGuard.is_a?(results, 'results', Array)
-      results.each_with_index do |r, i|
-        Applitools::ArgumentGuard.is_a?(r, "results[#{i}]", Applitools::TestResults)
+    attr_accessor :original_test_results
+    def initialize(all_test_results)
+      @original_test_results = all_test_results
+      @results = all_test_results[:results]
+      @passed = all_test_results[:passed]
+      @unresolved = all_test_results[:unresolved]
+      @failed = all_test_results[:failed]
+      @exceptions = all_test_results[:exceptions]
+      @mismatches = all_test_results[:mismatches]
+      @missing = all_test_results[:missing]
+      @matches = all_test_results[:matches]
+    end
+
+    def old_style_results_array
+      Applitools::Utils.deep_stringify_keys(results).map do |e|
+        r = e['testResults'] ? e['testResults'] : {}
+        Applitools::TestResults.new(r)
       end
     end
   end

data/lib/applitools/universal_sdk/universal_check_settings.rb

@@ -11,18 +11,22 @@ module Applitools
     #     layoutBreakpoints?: boolean | number[]
     #     visualGridOptions?: {[key: string]: any}
     #     hooks?: {beforeCaptureScreenshot: string}
+    #     pageId?: string
     #     renderId?: string
     #     variationGroupId?: string
     #     timeout?: number
+    #     waitBeforeCapture?: number
     #   }
     json_fields :name,
       :disableBrowserFetching,
       :layoutBreakpoints,
       :visualGridOptions,
       :hooks,
+      :pageId,
       :renderId,
       :variationGroupId,
-      :timeout
+      :timeout,
+      :waitBeforeCapture
 
     # export type MatchSettings<TRegion> = {
     #   exact?: {
@@ -139,6 +143,8 @@ module Applitools
       self.strict_regions = target.strict_regions
       self.timeout = target.options[:timeout]
       self.variation_group_id = target.options[:variation_group_id]
+      self.wait_before_capture = target.options[:wait_before_capture]
+      self.page_id = target.options[:page_id]
 
       self.scroll_root_element = target.options[:scroll_root_element] || eyes.scroll_root_element
       self.layout_breakpoints = target.options[:layout_breakpoints] || eyes.layout_breakpoints

data/lib/applitools/universal_sdk/universal_client.rb

@@ -20,7 +20,7 @@ module Applitools::Connectivity
     CORE_DELETE_TEST = 'Core.deleteTest'
 
     EYES_MANAGER_MAKE_EYES = 'EyesManager.openEyes'
-    EYES_MANAGER_CLOSE_ALL_EYES = 'EyesManager.closeAllEyes'
+    EYES_MANAGER_CLOSE_ALL_EYES = 'EyesManager.closeManager'
     EYES_CHECK = 'Eyes.check'
     EYES_LOCATE = 'Eyes.locate'
     EYES_EXTRACT_TEXT_REGIONS = 'Eyes.extractTextRegions'
@@ -93,8 +93,15 @@ module Applitools::Connectivity
       await(->(cb) { @socket.request(CORE_SET_VIEWPORT_SIZE, {driver: driver, size: size}, cb) })
     end
 
-    def core_close_batches(close_batch_settings)
+    def core_close_batches(close_batch_settings=nil)
       # batchIds, serverUrl?, apiKey?, proxy?
+      unless close_batch_settings.is_a?(Hash)
+        batch_ids = [@open_config[:batch][:id]]
+        batch_ids = [close_batch_settings] if close_batch_settings.is_a?(String)
+        batch_ids = close_batch_settings if close_batch_settings.is_a?(Array)
+        optional = [:serverUrl, :apiKey, :proxy].map {|k| [k, @open_config[k]] }.to_h
+        close_batch_settings = { settings: ({ batchIds: batch_ids }.merge(optional).compact) }
+      end
       await(->(cb) { @socket.request(CORE_CLOSE_BATCHES, close_batch_settings, cb) })
     end
 

data/lib/applitools/universal_sdk/universal_eyes_config.rb

@@ -97,6 +97,7 @@ module Applitools
     #   cut?: ImageCropRect | ImageCropRegion
     #   rotation?: ImageRotation
     #   scaleRatio?: number
+    #   waitBeforeCapture?: number
     # }
     json_fields :waitBeforeScreenshots,
       :stitchMode,
@@ -106,7 +107,8 @@ module Applitools
       :scrollRootElement,
       :cut,
       :rotation,
-      :scaleRatio
+      :scaleRatio,
+      :waitBeforeCapture
 
     # export type EyesUFGConfig = {
     #   concurrentSessions?: number
@@ -125,7 +127,7 @@ module Applitools
     FROM_ORIGINAL_EYES = [:api_key, :app_name, :batch, :browsers_info, :concurrent_sessions, :debug_screenshots,
       :force_full_page_screenshot, :hide_caret, :hide_scrollbars, :host_app, :host_os, :match_timeout, :proxy,
       :save_failed_tests, :save_new_tests, :scale_ratio, :send_dom, :server_url, :stitch_mode, :test_name,
-      :viewport_size, :visual_grid_options, :wait_before_screenshots] + [
+      :viewport_size, :visual_grid_options, :wait_before_screenshots, :wait_before_capture] + [
       :disabled?, # disabled? => is_disabled
       :stitching_overlap, # SeleniumEyes.stitching_overlap => stitch_overlap
       :dont_fetch_resources # dont_fetch_resources => disable_browser_fetching

data/lib/applitools/universal_sdk/universal_server.rb

@@ -46,8 +46,9 @@ module Applitools::Connectivity
     private
 
     def filename
+      return 'eyes-universal-win.exe' if Gem.win_platform?
       case RUBY_PLATFORM
-        when /mswin|windows/i
+        when /mswin|windows|mingw/i
           'eyes-universal-win.exe'
         when /linux|arch/i
           'eyes-universal-linux'

data/lib/applitools/utils/image_utils.rb

@@ -15,16 +15,16 @@ module Applitools::Utils
     # Creates an image object from the PNG bytes.
     # @param [String] png_bytes A binary string of the PNG bytes of the image.
     # @return [ChunkyPNG::Canvas] An image object.
-    def png_image_from_bytes(png_bytes)
-      ChunkyPNG::Image.from_blob(png_bytes)
-    end
+    # def png_image_from_bytes(png_bytes)
+    #   ChunkyPNG::Image.from_blob(png_bytes)
+    # end
 
     # Creates an image instance from a base64 representation of its PNG encoding.
     # @param [String] png_bytes The Base64 representation of a PNG image.
     # @return [ChunkyPNG::Canvas] An image object.
-    def png_image_from_base64(png_bytes)
-      png_image_from_bytes(Base64.decode64(png_bytes))
-    end
+    # def png_image_from_base64(png_bytes)
+    #   png_image_from_bytes(Base64.decode64(png_bytes))
+    # end
 
     # Get the raw PNG bytes of an image.
     # @param [ChunkyPNG::Canvas] image The image object for which to get the PNG bytes.
@@ -99,7 +99,7 @@ module Applitools::Utils
       Applitools::ArgumentGuard.not_nil(new_width, 'new_width')
       Applitools::ArgumentGuard.not_nil(new_height, 'new_height')
       Applitools::ArgumentGuard.not_nil(image, 'image')
-      Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+      # Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
 
       raise Applitools::EyesIllegalArgument.new "Invalid width: #{new_width}" if new_width <= 0
       raise Applitools::EyesIllegalArgument.new "Invalid height: #{new_height}" if new_height <= 0

data/lib/applitools/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.0.2'.freeze
-  UNIVERSAL_VERSION = '1.0.9'.freeze
+  VERSION = '4.0.5'.freeze
+  UNIVERSAL_VERSION = '2.5.11'.freeze
 end

data/lib/eyes_core.rb

@@ -65,7 +65,7 @@ end
 require_relative 'applitools/method_tracer'
 require_relative 'applitools/extensions'
 require_relative 'applitools/version'
-require_relative 'applitools/chunky_png_patch'
+# require_relative 'applitools/chunky_png_patch'
 
 Applitools.require_dir 'utils'
 Applitools.require_dir 'core'

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.5
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oily_png
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: chunky_png
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 2.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 2.5.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -353,8 +325,6 @@ files:
 - lib/applitools/calabash_steps.rb
 - lib/applitools/capybara/capybara_settings.rb
 - lib/applitools/capybara/driver.rb
-- lib/applitools/chunky_png/resampling.rb
-- lib/applitools/chunky_png_patch.rb
 - lib/applitools/connectivity/proxy.rb
 - lib/applitools/connectivity/server_connector.rb
 - lib/applitools/connectivity/user_agent_middleware.rb

data/lib/applitools/chunky_png/resampling.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Applitools
-  class Enumerator < ::Enumerator
-    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-      attr_reader :size
-      def initialize(*args)
-        @size = args[0] if args.size == 1
-        super()
-      end
-    end
-  end
-end
-
-module Applitools::ChunkyPNG
-  module Resampling
-    def resample_bicubic!(dst_width, dst_height)
-      new_pixels = resampling_first_step(dst_width, dst_height)
-      replace_canvas!(dst_width, dst_height, new_pixels)
-      self
-    end
-
-    def resample_bicubic(new_width, new_height)
-      dup.resample_bicubic!(new_width, new_height)
-    end
-
-    def bicubic_x_points(dst_width)
-      bicubic_points2(width, dst_width, false)
-    end
-
-    def bicubic_y_points(dst_height)
-      bicubic_points2(height, dst_height, true)
-    end
-
-    def line_with_bounds(y, src_dimension, direction)
-      line = (direction ? column(y) : row(y))
-      [imaginable_point(line[0], line[1])] + line + [
-        imaginable_point(line[src_dimension - 2], line[src_dimension - 3]),
-        imaginable_point(line[src_dimension - 1], line[src_dimension - 2])
-      ]
-    end
-
-    def imaginable_point(point1, point2)
-      r = [0, [255, ChunkyPNG::Color.r(point1) << 1].min - ChunkyPNG::Color.r(point2)].max
-      g = [0, [255, ChunkyPNG::Color.g(point1) << 1].min - ChunkyPNG::Color.g(point2)].max
-      b = [0, [255, ChunkyPNG::Color.b(point1) << 1].min - ChunkyPNG::Color.b(point2)].max
-      a = [0, [255, ChunkyPNG::Color.a(point1) << 1].min - ChunkyPNG::Color.a(point2)].max
-      ChunkyPNG::Color.rgba(r, g, b, a)
-    end
-  end
-end

data/lib/applitools/chunky_png_patch.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'oily_png'
-# require 'chunky_png'
-require_relative 'chunky_png/resampling'
-require 'eyes_core/eyes_core'
-
-ChunkyPNG::Canvas.class_eval do
-  include Applitools::ChunkyPNG::Resampling
-  include Applitools::ResamplingFast
-end