eyes_core 3.16.9 → 3.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d33995f6a13bac158b4e12611e82e795fe7c0e1647ebaccd8eaae405120b1876
-  data.tar.gz: 0d50d927523d1f6c2a083bdde504001b5b69f7e959f16b9d976453275d0804c4
+  metadata.gz: c75ae72ac98e660835958999ba3ae252c959f3909dac96fd155ff16929b0b1b4
+  data.tar.gz: fc5ebaf6841c6f7603b2f0f304758c94ba525c4396af3d0cdc8ea8afb235ebbe
 SHA512:
-  metadata.gz: 9d283954ecc0f32362d39f57a9462713999793e76bea1770fb0655b4b11c1cbd6fbfdd5a957d1f4817c2ac8a93983c00cb07a011b6554a894063fc21e0539c33
-  data.tar.gz: 82f3bfba44f94c44efb7b0c04510a7e15a37b2249cdbc578bedfc9f605855d31934759b3570fad2062c8430207e8642df9cb6d3e472c21976787b04ddb341ed0
+  metadata.gz: b4ffe23703a591f0559d083e3392625c8aac6f75588b55305e2fff06db14779a289ddfb231812f3d1edda1d11c342892635b483d549f0270f2a759dd8eedfe91
+  data.tar.gz: 5e5c5e0e773e38108b13c60aed7632d3daca1b111d2d9d853e7a4aa06024897922abcdc02235e781a39ca6effb28cbf8f61490f01d550c01af98496962ea7d7a

data/lib/applitools/connectivity/server_connector.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: false
 
 require 'faraday'
+require 'faraday_middleware'
+require 'faraday-cookie_jar'
 require 'oj'
 require 'securerandom'
 
@@ -10,6 +12,10 @@ require 'uri'
 
 module Applitools::Connectivity
   class ServerConnector
+    class << self
+      attr_accessor :faraday_adapter, :connection_timeout
+    end
+    self.faraday_adapter = :net_http
     class ScreenshotUploadError < Applitools::EyesError; end
     extend Applitools::Helpers
     DEFAULT_SERVER_URL = 'https://eyesapi.applitools.com'.freeze
@@ -153,23 +159,14 @@ module Applitools::Connectivity
     def download_resource(url, ua_string = nil)
       Applitools::EyesLogger.debug "Fetching #{url}..."
       resp_proc = proc do |u|
-        Faraday::Connection.new(
-          u,
-          ssl: { ca_file: SSL_CERT },
-          proxy: @proxy.nil? ? nil : @proxy.to_hash
-        ).send(:get) do |req|
-          req.options.timeout = DEFAULT_TIMEOUT
+        faraday_connection(u).send(:get) do |req|
+          req.options.timeout = self.class.connection_timeout || DEFAULT_TIMEOUT
           req.headers[:accept_encoding] = 'identity'
-          req.headers[:accept_language] = 'en'
+          req.headers[:accept_language] = '*'
           req.headers[:user_agent] = ua_string if ua_string
         end
       end
       response = resp_proc.call(url)
-      redirect_count = 10
-      while response.status == 301 && redirect_count > 0
-        redirect_count -= 1
-        response = resp_proc.call(response.headers['location'])
-      end
       Applitools::EyesLogger.debug "Done. (#{url} #{response.status})"
       response
     end
@@ -300,6 +297,18 @@ module Applitools::Connectivity
 
     private
 
+    def faraday_connection(url)
+      Faraday.new(
+        url: url,
+        ssl: { ca_file: SSL_CERT },
+        proxy: @proxy.nil? ? nil : @proxy.to_hash
+      ) do |faraday|
+        faraday.use FaradayMiddleware::FollowRedirects
+        faraday.use :cookie_jar
+        faraday.adapter self.class.faraday_adapter
+      end
+    end
+
     DEFAULT_HEADERS = {
       'Accept' => 'application/json',
       'Content-Type' => 'application/json'
@@ -338,11 +347,7 @@ module Applitools::Connectivity
 
     def request(url, method, options = {})
       Applitools::EyesLogger.debug("Requesting #{url} (method: #{method})")
-      response = Faraday::Connection.new(
-        url,
-        ssl: { ca_file: SSL_CERT },
-        proxy: @proxy.nil? ? nil : @proxy.to_hash
-      ).send(method) do |req|
+      response = faraday_connection(url).send(method) do |req|
         req.options.timeout = DEFAULT_TIMEOUT
         req.headers = DEFAULT_HEADERS.merge(options[:headers] || {})
         req.headers['Content-Type'] = options[:content_type] if options.key?(:content_type)
@@ -354,11 +359,7 @@ module Applitools::Connectivity
     end
 
     def dummy_request(url, method, options = {})
-      Faraday::Connection.new(
-        url,
-        ssl: { ca_file: SSL_CERT },
-        proxy: @proxy.nil? ? nil : @proxy.to_hash
-      ).send(method) do |req|
+      faraday_connection(url).send(method) do |req|
         req.options.timeout = options[:timeout] || DEFAULT_TIMEOUT
         req.headers = DEFAULT_HEADERS.merge(options[:headers] || {})
         req.headers['Content-Type'] = options[:content_type] if options.key?(:content_type)

data/lib/applitools/core/future.rb

@@ -3,6 +3,11 @@
 module Applitools
   class Future
     attr_accessor :result, :semaphore, :block, :thread, :description
+    DEFAULT_TIMEOUT = 350
+    class << self
+      attr_accessor :timeout
+    end
+    self.timeout = DEFAULT_TIMEOUT
 
     def initialize(semaphore, description = nil, &block)
       raise Applitools::EyesIllegalArgument, 'Applitools::Future must be initialized with a block' unless block_given?
@@ -21,7 +26,7 @@ module Applitools
     end
 
     def get
-      thread.join(350)
+      thread.join(self.class.timeout)
       raise Applitools::EyesError, "Failed to execute future - got nil result! (#{description})" if result.nil?
       result
     end

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.16.9
+  version: 3.16.10
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-cookie_jar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement