eyes_core 3.17.0 → 3.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e542320871204f754110c7419d817feb2385f625dc0adff02c02fe33c42f876
-  data.tar.gz: c12ab16b92d42b54e1b925280efb94acf3e75a2bba2082bca89b5268ca1ada08
+  metadata.gz: 864e172f6fa3b2035c0e8aa7a655e98d83de4bfe07c821f2cef2260e5df12747
+  data.tar.gz: e85acaa6dc31a5d09fc0e8060267b7c0be45c435fd54d5a1ef621a20d4c9de35
 SHA512:
-  metadata.gz: 8de1e5421cf619b5978bfdf3264b72d8b1c563b22fd9ea6c3a02448dbe650a2787d18f8ffc8edeac8b2dfd94096a1ba20df5266bbff6a9e91a9bf9710a3e496e
-  data.tar.gz: ef0e7307e4062eaad4825547f0cc97df89295d57cc6510500bca365d92575e3afbf0af2db598f0667ba800dc0ce83e565fd3b55a6b071e8bdb3abd3c4ba47be0
+  metadata.gz: 3d62989db64a12ab1542ea9e1218a21646e5d209c17723570568f60ef13cfd8cd16aed6fd678afa34c5be60cb0c8d3c382b65b448760c52bf2faa49f89131601
+  data.tar.gz: 57696e8e7e2145ef6570ac42f55cff2560046fd5ce3193f16c2f6328811e8439a50b3d9bbdfcbddfa9d745ce12840d4f6754ef668896b3c357c75d5803f59c28

data/lib/applitools/connectivity/server_connector.rb

@@ -279,14 +279,11 @@ module Applitools::Connectivity
     end
 
     def start_session(session_start_info)
-      request_body = Oj.dump(
-        startInfo: Applitools::Utils.camelcase_hash_keys(session_start_info.to_hash)
-      )
+      request_body = session_start_info.json
       res = long_post(
         endpoint_url, body: request_body
       )
       raise Applitools::EyesError.new("Request failed: #{res.status} #{res.body} #{request_body}") unless res.success?
-
       response = Oj.load(res.body)
       Applitools::Session.new(response, res.status == HTTP_STATUS_CODES[:created])
     end

data/lib/applitools/core/abstract_configuration.rb

@@ -11,9 +11,11 @@ module Applitools
     def initialize
       @config_hash = {}
       self.validation_errors = {}
-      default_config = self.class.default_config
-      default_config.keys.each do |k|
-        send "#{k}=", default_config[k]
+      if self.class.respond_to? :default_config
+        default_config = self.class.default_config
+        default_config.keys.each do |k|
+          send "#{k}=", default_config[k] unless default_config[k].nil?
+        end
       end
     end
 

data/lib/applitools/core/app_environment.rb

@@ -12,16 +12,20 @@ module Applitools
       self.device_info = options[:device_info]
     end
 
-    def to_hash
+    def json_data
       {
-        'os' => os,
-        'hostingApp' => hosting_app,
-        'displaySize' => display_size && display_size.to_hash,
-        'inferred' => inferred_environment,
-        'deviceInfo' => device_info.nil? || device_info.empty? ? 'Desktop' : device_info + ' (Chrome emulation)'
+          'os' => os,
+          'hostingApp' => hosting_app,
+          'displaySize' => display_size && display_size.to_hash,
+          'inferred' => inferred_environment,
+          'deviceInfo' => device_info.nil? || device_info.empty? ? 'Desktop' : device_info
       }
     end
 
+    def to_hash
+      json_data
+    end
+
     def to_s
       result = ''
       to_hash.each_pair do |k, v|

data/lib/applitools/core/batch_info.rb

@@ -19,16 +19,20 @@ module Applitools
       self.id = SecureRandom.uuid unless id
     end
 
-    def to_hash
+    def json_data
       {
-        'id' => id,
-        'name' => name,
-        'startedAt' => @started_at.iso8601,
-        'batchSequenceName' => sequence_name,
-        'notifyOnCompletion' => 'true'.casecmp(notify_on_completion || '') == 0 ? true : false
+          'id' => id,
+          'name' => name,
+          'startedAt' => @started_at.iso8601,
+          'batchSequenceName' => sequence_name,
+          'notifyOnCompletion' => 'true'.casecmp(notify_on_completion || '') == 0 ? true : false
       }
     end
 
+    def to_hash
+      json_data
+    end
+
     def to_s
       to_hash.to_s
     end

data/lib/applitools/core/eyes_base.rb

@@ -87,7 +87,6 @@ module Applitools
       self.results = []
       self.allow_empty_screenshot = true
       @inferred_environment = nil
-      @properties = []
       @server_scale = 0
       @server_remainder = 0
       get_app_output_method = ->(r, s) { get_app_output_with_screenshot r, s }
@@ -151,10 +150,6 @@ module Applitools
       running_session && running_session.new_session?
     end
 
-    def add_property(name, value)
-      @properties << { name: name, value: value }
-    end
-
     def abort_if_not_closed
       if disabled?
         logger.info "#{__method__} Ignored"
@@ -319,11 +314,14 @@ module Applitools
 
       tag = '' if tag.nil?
 
-      session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
-         scenario_id_or_name: test_name, batch_info: batch,
-         env_name: baseline_env_name, environment: app_environment,
-         default_match_settings: default_match_settings.json_data,
-         branch_name: branch_name, parent_branch_name: parent_branch_name, properties: properties
+      self.session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
+                                                     scenario_id_or_name: test_name, batch_info: batch,
+                                                     baseline_env_name: baseline_env_name, environment: app_env,
+                                                     default_match_settings: default_match_settings,
+                                                     environment_name: environment_name, session_type: session_type,
+                                                     branch_name: branch_name, parent_branch_name: parent_branch_name,
+                                                     baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
+                                                     properties: properties
 
       match_window_data.start_info = session_start_info
       match_window_data.update_baseline_if_new = save_new_tests
@@ -481,7 +479,7 @@ module Applitools
     attr_accessor :running_session, :last_screenshot, :scale_provider, :session_start_info,
       :should_match_window_run_once_on_timeout, :app_output_provider, :failed
 
-    attr_reader :user_inputs, :properties
+    attr_reader :user_inputs
 
     private :full_agent_id, :full_agent_id=
 
@@ -596,9 +594,11 @@ module Applitools
 
       self.session_start_info = SessionStartInfo.new agent_id: base_agent_id, app_id_or_name: app_name,
                                                 scenario_id_or_name: test_name, batch_info: batch,
-                                                env_name: baseline_env_name, environment: app_env,
-                                                default_match_settings: default_match_settings.json_data,
+                                                baseline_env_name: baseline_env_name, environment: app_env,
+                                                default_match_settings: default_match_settings,
+                                                environment_name: environment_name, session_type: session_type,
                                                 branch_name: branch_name, parent_branch_name: parent_branch_name,
+                                                baseline_branch_name: baseline_branch_name, save_diffs: save_diffs,
                                                 properties: properties
 
       logger.info 'Starting server session...'

data/lib/applitools/core/eyes_base_configuration.rb

@@ -12,16 +12,17 @@ require 'applitools/core/image_match_settings'
 module Applitools
   class EyesBaseConfiguration < AbstractConfiguration
     DEFAULT_CONFIG = {
-      branch_name: ENV['APPLITOOLS_BRANCH'] || '',
-      parent_branch_name: ENV['APPLITOOLS_PARENT_BRANCH'] || '',
-      baseline_branch_name: ENV['APPLITOOLS_BASELINE_BRANCH'] || '',
+      branch_name: ENV['APPLITOOLS_BRANCH'],
+      parent_branch_name: ENV['APPLITOOLS_PARENT_BRANCH'],
+      baseline_branch_name: ENV['APPLITOOLS_BASELINE_BRANCH'],
       save_diffs: false,
       server_url: ENV['APPLITOOLS_SERVER_URL'] ||
         ENV['bamboo_APPLITOOLS_SERVER_URL'] || Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL,
       api_key: ENV['APPLITOOLS_API_KEY'] || ENV['bamboo_APPLITOOLS_API_KEY'] || '',
       save_new_tests: true,
       default_match_settings: Applitools::ImageMatchSettings.new,
-      accessibility_validation: nil
+      accessibility_validation: nil,
+      properties: []
     }.freeze
 
     class << self
@@ -111,6 +112,7 @@ module Applitools
     int_field :remainder
     boolean_field :ignore_caret
     object_field :accessibility_validation, Applitools::AccessibilitySettings, true
+    object_field :properties, Array
 
     methods_to_delegate.delete(:batch_info)
     methods_to_delegate.delete(:batch_info=)
@@ -168,7 +170,11 @@ module Applitools
       default_match_settings.accessibility_validation = value
     end
 
+    def add_property(name, value)
+      properties << { name: name, value: value } if name && value
+    end
 
     methods_to_delegate.push(:set_proxy)
+    methods_to_delegate.push(:add_property)
   end
 end

data/lib/applitools/core/jsonable.rb

@@ -7,9 +7,10 @@ module Applitools
       base.extend ClassMethods
       base.class_eval do
         class << self
-          attr_accessor :json_methods
+          attr_accessor :json_methods, :wrap_data_block
         end
         @json_methods = {}
+        @wrap_data_block = nil
       end
     end
 
@@ -34,10 +35,20 @@ module Applitools
       def json_fields(*args)
         args.each { |m| json_field m }
       end
+
+      def wrap_data(&block)
+        @wrap_data_block = block
+      end
     end
 
     def json_data
-      self.class.json_methods.sort.map { |k, v| [k, json_value(send(v))] }.to_h
+      result = self.class.json_methods.sort.map do |k,v|
+        val = json_value(send(v))
+        next if val.nil?
+        [k, val]
+      end.compact.to_h
+      result = self.class.wrap_data_block.call(result) if self.class.wrap_data_block.is_a? Proc
+      result
     end
 
     def json

data/lib/applitools/core/session_start_info.rb

@@ -2,38 +2,36 @@
 
 module Applitools
   class SessionStartInfo
-    attr_accessor :app_id_or_name, :scenario_id_or_name
+    include Applitools::Jsonable
+    json_fields :batchInfo, :agentId, :appIdOrName, :verId, :environment, :environmentName, :branchName, :defaultMatchSettings,
+      :scenarioIdOrName, :properties, :parentBranchName, :compareWithParentBranch, :baselineEnvName, :saveDiffs, :sessionType,
+      :baselineBranchName
+
+    wrap_data do |value|
+      { startInfo: value }
+    end
 
     def initialize(options = {})
-      @agent_id = options[:agent_id]
-      @app_id_or_name = options[:app_id_or_name]
-      @ver_id = options[:ver_id]
-      @scenario_id_or_name = options[:scenario_id_or_name]
-      @batch_info = options[:batch_info]
-      @env_name = options[:env_name]
-      @environment = options[:environment]
-      @default_match_settings = options[:default_match_settings]
-      @branch_name = options[:branch_name]
-      @parent_branch_name = options[:parent_branch_name]
-      @properties = options[:properties]
-      @compare_with_parent_branch = options[:compare_with_parent_branch]
+      self.agent_id = options[:agent_id]
+      self.app_id_or_name = options[:app_id_or_name]
+      self.ver_id = options[:ver_id]
+      self.scenario_id_or_name = options[:scenario_id_or_name]
+      self.batch_info = options[:batch_info]
+      self.environment_name = options[:environment_name]
+      self.baseline_env_name = options[:baseline_env_name]
+      self.environment = options[:environment]
+      self.default_match_settings = options[:default_match_settings]
+      self.branch_name = options[:branch_name]
+      self.parent_branch_name = options[:parent_branch_name]
+      self.properties = options[:properties]
+      self.compare_with_parent_branch = options[:compare_with_parent_branch]
+      self.save_diffs = options[:save_diffs]
+      self.session_type = options[:session_type]
+      self.baseline_branch_name = options[:baseline_branch_name]
     end
 
     def to_hash
-      {
-        agent_id: @agent_id,
-        app_id_or_name: @app_id_or_name,
-        ver_id: @ver_id,
-        scenario_id_or_name: @scenario_id_or_name,
-        batch_info: @batch_info && @batch_info.to_hash,
-        env_name: @env_name,
-        environment: @environment.to_hash,
-        default_match_settings: @default_match_settings,
-        branch_name: @branch_name,
-        parent_branch_name: @parent_branch_name,
-        compare_with_parent_branch: @compare_with_parent_branch,
-        properties: @properties
-      }
+      json_data
     end
   end
 end

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.17.5
 platform: ruby
 authors:
 - Applitools Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -370,7 +370,7 @@ licenses:
 - Applitools
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Core of the Applitools Ruby SDK
 test_files: []