eyes_core 3.15.4.beta → 3.15.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86201bfea58959c8bfe46f33e8b340e134636856b8bbe86ca4ab184e4ee5ff16
-  data.tar.gz: 7aabf30b0b9bc52e4f30efefd906fedcbc593f624018ae8b45ccf50779b567d1
+  metadata.gz: 05c5e4a10067d6eac35875c9400aae6bcd3506f059d74863b7d56c6347627cf4
+  data.tar.gz: b3e91e6173ac7cd8c4ebf301203b20b18b6c37850bea9fbc307b0d414735d0da
 SHA512:
-  metadata.gz: ddb0b2b3a128cef7a50d694f12da55d1c755dc19cfc08839aac7ec4df1b9b0cd2f359ddf6d107a0d9278cf4ef4d51ca9e8e49753d99896787a522b675996a66c
-  data.tar.gz: 72cf23f15e9f2816dd2d2e45d6bc591efb86de661f9cc67722b538c028fa19f8b26a4cdadbc39a381a4aa254269acf35fcc5aee8323cd4566b05709de788731b
+  metadata.gz: d00b47bbbd3fbdc878dc4eaada899b66d2bca68fbd07d25c3fb012557f7c5e4027de9c8b26fcd208e5c8ba4622baaaa7cb1c2327aa5336b859a77a2da834ac5a
+  data.tar.gz: 5dbc43c8c9751c0f498a2d2e2b9fb27f5e8eefca949abd7cf90d1a8d966599b2197b12d820909fd2bb22adf149e9fd0f65bfb3cc02526e396c4172c7ddf8e1df

data/lib/applitools/connectivity/server_connector.rb

@@ -269,7 +269,6 @@ module Applitools::Connectivity
         url,
         ssl: { ca_file: SSL_CERT },
         proxy: @proxy.nil? ? nil : @proxy.to_hash
-        # proxy: Applitools::Connectivity::Proxy.new('http://localhost:8000').to_hash
       ).send(method) do |req|
         req.options.timeout = DEFAULT_TIMEOUT
         req.headers = DEFAULT_HEADERS.merge(options[:headers] || {})
@@ -284,7 +283,6 @@ module Applitools::Connectivity
           url,
           ssl: { ca_file: SSL_CERT },
           proxy: @proxy.nil? ? nil : @proxy.to_hash
-          # proxy: Applitools::Connectivity::Proxy.new('http://localhost:8000').to_hash
       ).send(method) do |req|
         req.options.timeout = options[:timeout] || DEFAULT_TIMEOUT
         req.headers = DEFAULT_HEADERS.merge(options[:headers] || {})

data/lib/applitools/core/eyes_base.rb

@@ -31,8 +31,8 @@ module Applitools
     attr_accessor :config
 
     def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
-    def_delegators 'server_connector', :api_key, :api_key=, :server_url, :server_url=,
-      :set_proxy, :proxy, :proxy=
+    # def_delegators 'server_connector', :api_key, :api_key=, :server_url, :server_url=,
+    #   :set_proxy, :proxy, :proxy=
 
     # @!attribute [rw] verbose_results
     #   If set to true it will display test results in verbose format, including all fields returned by the server
@@ -45,7 +45,7 @@ module Applitools
 
     attr_accessor :batch, :full_agent_id,
       :match_timeout, :save_new_tests, :save_failed_tests, :failure_reports, :default_match_settings, :cut_provider,
-      :scale_ratio, :host_os, :host_app, :position_provider, :viewport_size, :verbose_results,
+      :scale_ratio, :position_provider, :viewport_size, :verbose_results,
       :inferred_environment, :remove_session_if_matching, :server_scale, :server_remainder, :match_level, :exact,
       :compare_with_parent_branch, :results
 
@@ -62,8 +62,9 @@ module Applitools
     def_delegators 'config', *Applitools::EyesBaseConfiguration.methods_to_delegate
 
     def initialize(server_url = nil)
-      self.server_connector = Applitools::Connectivity::ServerConnector.new(server_url)
+      @server_connector = Applitools::Connectivity::ServerConnector.new(server_url)
       ensure_config
+      self.server_url = server_url if server_url
       self.disabled = false
       @viewport_size = nil
       self.match_timeout = DEFAULT_MATCH_TIMEOUT
@@ -101,6 +102,20 @@ module Applitools
       self.config = Applitools::EyesBaseConfiguration.new
     end
 
+    def config=(value)
+      Applitools::ArgumentGuard.not_nil value, 'config'
+      Applitools::ArgumentGuard.is_a? value, 'config', Applitools::EyesBaseConfiguration
+      raise Applitools::EyesError, 'You can\'t use new config if eyes are opened' if open?
+      @config = value
+    end
+
+    def server_connector
+      @server_connector.server_url = config.server_url
+      @server_connector.api_key = config.api_key
+      @server_connector.proxy = config.proxy if config.proxy
+      @server_connector
+    end
+
     def match_level=(value)
       return @match_level = value if Applitools::MATCH_LEVEL.values.include?(value)
       return @match_level = Applitools::MATCH_LEVEL[value.to_sym] if Applitools::MATCH_LEVEL.keys.include?(value.to_sym)
@@ -502,7 +517,7 @@ module Applitools
     private
 
     attr_accessor :running_session, :last_screenshot, :scale_provider, :session_start_info, :should_match_window_run_once_on_timeout, :app_output_provider,
-      :failed, :server_connector
+      :failed
 
     attr_reader :user_inputs, :properties
 

data/lib/applitools/core/eyes_base_configuration.rb

@@ -1,6 +1,7 @@
 require 'applitools/core/rectangle_size'
 require 'applitools/core/session_types'
 require 'applitools/core/batch_info'
+require 'applitools/connectivity/proxy'
 
 module Applitools
   class EyesBaseConfiguration < AbstractConfiguration
@@ -8,7 +9,9 @@ module Applitools
       branch_name: ENV['APPLITOOLS_BRANCH'] || '',
       parent_branch_name: ENV['APPLITOOLS_PARENT_BRANCH'] || '',
       baseline_branch_name: ENV['APPLITOOLS_BASELINE_BRANCH'] || '',
-      save_diffs: false
+      save_diffs: false,
+      server_url: 'https://eyessdk.applitools.com',
+      api_key: ENV['APPLITOOLS_API_KEY'] || ''
     }.freeze
 
     class << self
@@ -66,6 +69,11 @@ module Applitools
     string_field :app_name
     string_field :test_name
     object_field :viewport_size, Applitools::RectangleSize
+    string_field :api_key
+    string_field :server_url
+    string_field :host_os
+    string_field :host_app
+    object_field :proxy, Applitools::Connectivity::Proxy
 
     def short_description
       "#{test_name} of #{app_name}"

data/lib/applitools/core/eyes_configuration_dsl.rb

@@ -38,7 +38,6 @@ module Applitools
     def string_field(field_name)
       collect_method field_name
       define_method(field_name) do
-        return '' unless config_hash[field_name.to_sym].is_a? String
         config_hash[field_name.to_sym]
       end
 
@@ -49,7 +48,9 @@ module Applitools
       end
 
       define_method("defined_#{field_name}?") do
-        !send(field_name).empty?
+        value = send(field_name)
+        return false if value.nil?
+        !value.empty?
       end
     end
 

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.4.beta'.freeze
+  VERSION = '3.15.5.beta'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.15.4.beta
+  version: 3.15.5.beta
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Core of the Applitools Ruby SDK