eyes_core 3.15.48 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea364f51bddd78bac702702c17bb0e57185559d9b67f593fab52eddd284209c0
-  data.tar.gz: 1169aeecca36f15efeafed9ac1aa61411038c9784b3d9addf18e58d096086b3e
+  metadata.gz: 7c8b1c4252bdea87951ac2bf9139c9271d2e673974f13edce49faa0d942e5101
+  data.tar.gz: 7b2c2ebe51fad932e0b391c6b892bbd378cc6c9795d3271eb6a1d68d7c63132c
 SHA512:
-  metadata.gz: 56ac6c762a49493511a89670f52d01721b51a318f53b6d643db1cf6c152c47e4a1dc59e37acad3808679298b153d8d81e61f6e1f2ca09de823bc304b6c96cad9
-  data.tar.gz: a451d2710086e2bf593fcd7af8bff87eceb764885e259f5016dcfc258dc3b6853709cd37084df6b56da4e51ecd75ee677f00bf4e17e83aeab02ce28c0dc728db
+  metadata.gz: 255a174ae78081297d821772d7601016e0b66b2b1f6de1f6ae162e269cf6001dd22d5497d16b0ae98f71788693e69bb73bdc0502d067ad8aa2823196336259ca
+  data.tar.gz: 1b1c4126c15b94f498c4807c3b0f96a56a258311da4f898b014dc119b59d2c39f20df5b4974be512f194951615a9d03a483f88ccb08d8d273fb2e90cb54db657

data/lib/applitools/appium/eyes.rb

@@ -9,6 +9,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::Eyes
   def initialize(*args)
     super
     self.dont_get_title = true
+    self.runner = Applitools::ClassicRunner.new
   end
 
   private :perform_driver_settings_for_appium_driver
@@ -59,7 +60,7 @@ class Applitools::Appium::Eyes < Applitools::Selenium::Eyes
   end
 
   def get_app_output_with_screenshot(*args)
-    super do |screenshot|
+    result = super do |screenshot|
       if scale_provider
         scaled_image = scale_provider.scale_image(screenshot.image)
         self.screenshot = Applitools::Appium::Screenshot.new(
@@ -76,6 +77,8 @@ class Applitools::Appium::Eyes < Applitools::Selenium::Eyes
         )
       end
     end
+    self.screenshot_url = nil
+    result
   end
 
   def dom_data

data/lib/applitools/calabash/eyes.rb

@@ -9,6 +9,7 @@ module Applitools
 
       def initialize(server_url = Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL)
         super
+        self.runner = Applitools::ClassicRunner.new
         self.base_agent_id = "eyes.calabash.ruby/#{Applitools::VERSION}".freeze
         self.debug_screenshots = false
         self.debug_screenshot_provider = Applitools::DebugScreenshotProvider.new
@@ -103,10 +104,9 @@ module Applitools
       end
 
       def get_app_output_with_screenshot(*args)
-        # super do |screenshot|
-        #   screenshot.scale_it!
-        # end
-        super(*args, &:scale_it!)
+        result = super(*args, &:scale_it!)
+        self.screenshot_url = nil
+        result
       end
 
       def entire_screenshot_region

data/lib/applitools/connectivity/server_connector.rb

@@ -2,14 +2,17 @@
 
 require 'faraday'
 require 'oj'
+require 'securerandom'
+
 Oj.default_options = { :mode => :compat }
 
 require 'uri'
 
 module Applitools::Connectivity
   class ServerConnector
+    class ScreenshotUploadError < Applitools::EyesError; end
     extend Applitools::Helpers
-    DEFAULT_SERVER_URL = 'https://eyesapi.applitools.com/'.freeze
+    DEFAULT_SERVER_URL = 'https://eyesapi.applitools.com'.freeze
 
     SSL_CERT = File.join(File.dirname(File.expand_path(__FILE__)), '../../../certs/cacert.pem').to_s.freeze
     DEFAULT_TIMEOUT = 300
@@ -65,6 +68,42 @@ module Applitools::Connectivity
       Oj.load response.body
     end
 
+    def put_screenshot(rendering_info, screenshot)
+      uuid = SecureRandom.uuid
+      upload_path = URI.parse(rendering_info.results_url.gsub(/__random__/, uuid))
+      retry_count = 3
+      wait = 0.5
+      loop do
+        raise ScreenshotUploadError, "Error uploading screenshot (#{upload_path})" if retry_count <= 0
+        Applitools::EyesLogger.info("Trying to upload screenshot (#{upload_path})...")
+        begin
+          response = dummy_put(
+            upload_path,
+            body: screenshot.image.to_blob,
+            headers: {
+              'x-ms-blob-type': 'BlockBlob',
+              'X-Auth-Token': rendering_info.access_token
+            },
+            query: URI.decode_www_form(upload_path.query).to_h,
+            content_type: 'image/png'
+          )
+          break if response.status == HTTP_STATUS_CODES[:created]
+          Applitools::EyesLogger.info("Failed. Retrying in #{wait} seconds")
+          sleep(wait)
+        rescue StandardError => e
+          Applitools::EyesLogger.error(e.class.to_s)
+          Applitools::EyesLogger.error(e.message)
+          Applitools::EyesLogger.info("Failed. Retrying in #{wait} seconds")
+          sleep(wait)
+        ensure
+          retry_count -= 1
+          wait *= 2
+        end
+      end
+      Applitools::EyesLogger.info('Done.')
+      upload_path.to_s
+    end
+
     def render_put_resource(service_url, access_key, resource, render)
       uri = URI(service_url)
       uri.path = RESOURCES_SHA_256 + resource.hash
@@ -165,10 +204,17 @@ module Applitools::Connectivity
     def match_window(session, data)
       # Notice that this does not include the screenshot.
       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
+      body = if data.screenshot.empty?
+               content_type = 'application/json'
+               json_data
+             else
+               content_type = 'application/octet-stream'
+               [json_data.length].pack('L>') + json_data + data.screenshot
+             end
+
       Applitools::EyesLogger.debug 'Sending match data...'
       Applitools::EyesLogger.debug json_data
-      res = long_post(URI.join(endpoint_url, session.id.to_s), content_type: 'application/octet-stream', body: body)
+      res = long_post(URI.join(endpoint_url, session.id.to_s), content_type: content_type, body: body)
       raise Applitools::EyesError.new("Request failed: #{res.status} #{res.headers}") unless res.success?
       # puts Oj.load(res.body)
       Applitools::MatchResult.new Oj.load(res.body)

data/lib/applitools/core/classic_runner.rb

@@ -31,5 +31,9 @@ module Applitools
       end
       all_test_results
     end
+
+    def rendering_info(connector)
+      @rendering_info ||= RenderingInfo.new(connector.rendering_info)
+    end
   end
 end

data/lib/applitools/core/eyes_base.rb

@@ -47,7 +47,7 @@ module Applitools
       :match_timeout, :save_new_tests, :save_failed_tests, :failure_reports, :default_match_settings, :cut_provider,
       :scale_ratio, :position_provider, :viewport_size, :verbose_results,
       :inferred_environment, :remove_session_if_matching, :server_scale, :server_remainder, :exact,
-      :compare_with_parent_branch, :results, :runner
+      :compare_with_parent_branch, :results, :runner, :allow_empty_screenshot, :screenshot_url
 
     abstract_attr_accessor :base_agent_id
     abstract_method :capture_screenshot, true
@@ -82,6 +82,7 @@ module Applitools
       self.verbose_results = false
       self.failed = false
       self.results = []
+      self.allow_empty_screenshot = true
       @inferred_environment = nil
       @properties = []
       @server_scale = 0
@@ -650,6 +651,14 @@ module Applitools
 
       screenshot = yield(screenshot) if block_given?
 
+      if screenshot
+        self.screenshot_url = server_connector.put_screenshot(
+          runner.rendering_info(server_connector),
+          screenshot
+        )
+        screenshot = nil
+      end
+
       logger.info 'Getting title...'
       a_title = title
       logger.info 'Done!'
@@ -659,7 +668,8 @@ module Applitools
           o.dom_url = dom_url unless dom_url && dom_url.empty?
           o.screenshot_url = screenshot_url if respond_to?(:screenshot_url) && !screenshot_url.nil?
         end,
-        screenshot
+        screenshot,
+        allow_empty_screenshot
       )
     end
 

data/lib/applitools/core/eyes_base_configuration.rb

@@ -6,6 +6,7 @@ require 'applitools/core/batch_info'
 require 'applitools/connectivity/proxy'
 require 'applitools/core/match_level'
 require 'applitools/core/match_level_setter'
+require 'applitools/connectivity/server_connector'
 
 module Applitools
   class EyesBaseConfiguration < AbstractConfiguration
@@ -17,7 +18,7 @@ module Applitools
       baseline_branch_name: ENV['APPLITOOLS_BASELINE_BRANCH'] || '',
       save_diffs: false,
       server_url: ENV['APPLITOOLS_SERVER_URL'] ||
-        ENV['bamboo_APPLITOOLS_SERVER_URL'] || 'https://eyessdk.applitools.com',
+        ENV['bamboo_APPLITOOLS_SERVER_URL'] || Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL,
       api_key: ENV['APPLITOOLS_API_KEY'] || ENV['bamboo_APPLITOOLS_API_KEY'] || '',
       match_level: Applitools::MatchLevel::STRICT,
       scale: 0,

data/lib/applitools/core/rendering_info.rb

@@ -0,0 +1,26 @@
+module Applitools
+  class RenderingInfo
+    attr_accessor :response
+    def initialize(response)
+      Applitools::ArgumentGuard.not_nil(response, 'response')
+      Applitools::ArgumentGuard.hash(response, 'response')
+      self.response = response
+    end
+
+    def service_url
+      response['serviceUrl']
+    end
+
+    def results_url
+      response['resultsUrl']
+    end
+
+    def stitching_service_url
+      response['stitchingServiceUrl']
+    end
+
+    def access_token
+      response['accessToken']
+    end
+  end
+end

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.15.48
+  version: 3.16.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -297,6 +297,7 @@ files:
 - lib/applitools/core/rectangle_size.rb
 - lib/applitools/core/region.rb
 - lib/applitools/core/region_provider.rb
+- lib/applitools/core/rendering_info.rb
 - lib/applitools/core/screenshot.rb
 - lib/applitools/core/session.rb
 - lib/applitools/core/session_start_info.rb