eyes_core 3.14.2 → 3.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb52c6e800a0c68741e5457a6a0701ecd7a140dd
-  data.tar.gz: 236b3a5872b65eac9af5adf2af8f992def5ef6ed
+  metadata.gz: 5d9bf7c4a1a591be9f9e5a4fa1f97b5f6d89fdf1
+  data.tar.gz: b46c22f0b9a08fe8e7f1e768306bb787a6bf026c
 SHA512:
-  metadata.gz: 9eeb6512ea56c8b3d8e2caa4c187a121d841587d3c97072094a24085576313f2bc13f6de7ad2181b880a397b5b4a740fa6617a4badb52bd6079818cb691056ac
-  data.tar.gz: 56f36fd54268dabed644de5ab3eafa933a7cf3b229810918f9a36f805bc424f9b46033647565902cc6c98d78b978c3677934ef3645093e121cebdc759a883478
+  metadata.gz: 117dc8fdfc6a5dad6576c2d120ffc6d8fcde6c290eab3c5452e606d437fbd74900426148a16940b4897d0be9c90346ab42718708a976a33da24fb7fd89a07b77
+  data.tar.gz: 05340e98ffa98f3fcc433329c4bef32acafadd12c6cb39c0bf429a2cb37f2a1caf9c169047d71bbf32ee568712dd5a244c061e7c35792613fe5fe03fd9292592

data/lib/applitools/calabash/eyes.rb

@@ -8,7 +8,7 @@ module Applitools
       def initialize(server_url = Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL)
         super
         self.base_agent_id = "eyes.calabash.ruby/#{Applitools::VERSION}".freeze
-        self.debug_screenshot = true
+        self.debug_screenshot = false
         self.debug_screenshot_provider = Applitools::DebugScreenshotProvider.new
                                                                             .tag_access { tag_for_debug }
                                                                             .debug_flag_access { debug_screenshot }

data/lib/applitools/calabash/eyes_calabash_android_screenshot.rb

@@ -8,7 +8,8 @@ module Applitools
         213 => 1.33,
         240 => 1.5,
         320 => 2,
-        480 => 3
+        480 => 3,
+        640 => 4
       }.freeze
 
       def initialize(*args)

data/lib/applitools/calabash/eyes_hooks.rb

@@ -19,7 +19,7 @@ if respond_to?(:After)
   After('@eyes') do |_scenario|
     eyes = Applitools::Calabash::EyesSettings.instance.eyes
     Applitools::Calabash::EyesSettings.instance.eyes.remove_context if eyes && eyes.open?
-    step %(terminate eyes session)
+    step %(terminate eyes session) if eyes && eyes.running_session?
   end
 end
 

data/lib/applitools/calabash/rspec_matchers.rb

@@ -2,8 +2,9 @@ require 'rspec/expectations'
 
 RSpec::Matchers.define :match_baseline do |expected|
   match do |actual|
-    result = Applitools::Calabash::EyesSettings.instance.eyes.check(expected, actual)
-    result.as_expected?
+    eyes = Applitools::Calabash::EyesSettings.instance.eyes
+    result = eyes.check(expected, actual)
+    eyes.new_session? || result.as_expected?
   end
 
   failure_message do |_actual|

data/lib/applitools/core/eyes_base.rb

@@ -35,7 +35,8 @@ module Applitools
     attr_accessor :app_name, :baseline_name, :branch_name, :parent_branch_name, :batch, :agent_id, :full_agent_id,
       :match_timeout, :save_new_tests, :save_failed_tests, :failure_reports, :default_match_settings, :cut_provider,
       :scale_ratio, :host_os, :host_app, :base_line_name, :position_provider, :viewport_size, :verbose_results,
-      :inferred_environment, :remove_session_if_matching, :server_scale, :server_remainder, :match_level, :exact
+      :inferred_environment, :remove_session_if_matching, :server_scale, :server_remainder, :match_level, :exact,
+      :compare_with_parent_branch
 
     abstract_attr_accessor :base_agent_id
     abstract_method :capture_screenshot, true
@@ -74,6 +75,7 @@ module Applitools
       self.match_level = Applitools::MATCH_LEVEL[:strict]
       self.server_scale = 0
       self.server_remainder = 0
+      self.compare_with_parent_branch = false
     end
 
     def match_level=(value)
@@ -155,6 +157,14 @@ module Applitools
       @open
     end
 
+    def running_session?
+      running_session.nil? ? false : true
+    end
+
+    def new_session?
+      running_session && running_session.new_session?
+    end
+
     def app_name
       !current_app_name.nil? && !current_app_name.empty? ? current_app_name : @app_name
     end
@@ -217,7 +227,8 @@ module Applitools
       logger.info "openBase(app_name: #{options[:app_name]}, test_name: #{options[:test_name]}," \
           " viewport_size: #{options[:viewport_size]})"
 
-      raise Applitools::EyesError.new 'API key is missing! Please set it using api_key=' if api_key.nil?
+      raise Applitools::EyesError.new 'API key is missing! Please set it using api_key=' if
+        api_key.nil? || (api_key && api_key.empty?)
 
       self.viewport_size = options[:viewport_size]
       self.session_type = options[:session_type]
@@ -451,6 +462,10 @@ module Applitools
       self.current_app_name = nil
     end
 
+    def compare_with_parent_branch=(value)
+      @compare_with_parent_branch = value ? true : false
+    end
+
     private
 
     attr_accessor :running_session, :last_screenshot, :current_app_name, :test_name, :session_type,
@@ -570,15 +585,14 @@ module Applitools
         self.viewport_size = get_viewport_size
       end
 
-      logger.info "Batch is #{batch}"
-      test_batch = batch
+      logger.info "Batch is #{@batch}" if @batch
 
       app_env = app_environment
 
       logger.info "Application environment is #{app_env}"
 
       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: test_batch,
+                                                scenario_id_or_name: test_name, batch_info: @batch,
                                                 env_name: baseline_name, environment: app_env,
                                                 default_match_settings: default_match_settings,
                                                 branch_name: branch_name, parent_branch_name: parent_branch_name,

data/lib/applitools/core/match_window_data.rb

@@ -20,7 +20,7 @@ module Applitools
               'MatchLevel' => 'Strict',
               'SplitTopHeight' => 0,
               'SplitBottomHeight' => 0,
-              'IgnoreCaret' => false,
+              'IgnoreCaret' => true,
               'Ignore' => [],
               'Floating' => [],
               'Exact' => {

data/lib/applitools/core/rectangle_size.rb

@@ -23,7 +23,7 @@ module Applitools
       end
 
       def from_struct(value)
-        new value.width, value.height
+        new value.width.to_i, value.height.to_i
       end
     end
 

data/lib/applitools/core/session_start_info.rb

@@ -14,6 +14,7 @@ module Applitools
       @branch_name = options[:branch_name]
       @parent_branch_name = options[:parent_branch_name]
       @properties = options[:properties]
+      @compare_with_parent_branch = options[:compare_with_parent_branch]
     end
 
     def to_hash
@@ -22,12 +23,13 @@ module Applitools
         app_id_or_name: @app_id_or_name,
         ver_id: @ver_id,
         scenario_id_or_name: @scenario_id_or_name,
-        batch_info: @batch_info.to_hash,
+        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
       }
     end

data/lib/applitools/utils/eyes_selenium_utils.rb

@@ -127,8 +127,8 @@ module Applitools::Utils
 
     # true if test is running on mobile device
     def mobile_device?
+      return nil unless defined?(Appium::Driver)
       return $driver if $driver && $driver.is_a?(Appium::Driver)
-      nil
     end
 
     # true if test is running on Android device

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.14.2'.freeze
+  VERSION = '3.14.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.14.2
+  version: 3.14.3
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby SDK