eyes_core 3.2.2 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f8c3db87db9835c4dc79c765959e83c8aeb946
-  data.tar.gz: 7d727cecee7d09a6a9fe4f835bcbb4adab06c5f4
+  metadata.gz: e7e9bc76bd9015774835b3ff69d84a0a99a72c26
+  data.tar.gz: 88068cae26e46a091931f6ca3a85cd30e34a4a28
 SHA512:
-  metadata.gz: '018bbc1ef29fa85b6bf41e4265926372dc04cfb27bc1afcdd71655ce495c2707736f713ceffe774b670282e1b1551c10e54d879eb5a6776e526d881590b8a69c'
-  data.tar.gz: 46a71295b6d39855ee931165c4eb804dcee4c5d8c0032ff6c1344c2f5e7ceea8c5dffd6be95b748171d347b1a20689e0c0cc5233f0ceb992f259c57d65436ad5
+  metadata.gz: 611499123fdc78d786155cc188a185ca7a8dcf9fb4f2a84551648e6658dd19cd92585134c0b67ade65ac0b2f12e14c98de77e1c6a746434b8eaaa5df3589678b
+  data.tar.gz: cefb39a916f17a2de86f80f5836f5979e7330f8afb0f2ce847cf72a5da3fa0c66370d99479cd859ff5ab5cfd67a1c09b446b5c1d53f9279113e9f9c1140c75e0

data/lib/applitools/connectivity/server_connector.rb

@@ -49,16 +49,17 @@ module Applitools::Connectivity
       # 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
+      #Applitools::EyesLogger.debug json_data
       Applitools::EyesLogger.debug 'Sending match data...'
       res = post(URI.join(endpoint_url, session.id.to_s), content_type: 'application/octet-stream', body: body)
-      raise Applitools::EyesError.new("Request failed: #{res.status}") unless res.success?
+      raise Applitools::EyesError.new("Request failed: #{res.status} #{res.headers}") unless res.success?
       Applitools::MatchResult.new Oj.load(res.body)
     end
 
     def start_session(session_start_info)
       res = post(endpoint_url, body: Oj.dump(startInfo:
                                                  Applitools::Utils.camelcase_hash_keys(session_start_info.to_hash)))
-      raise Applitools::EyesError.new("Request failed: #{res.status}") unless res.success?
+      raise Applitools::EyesError.new("Request failed: #{res.status} #{res.body}") unless res.success?
 
       response = Oj.load(res.body)
       Applitools::Session.new(response['id'], response['url'], res.status == HTTP_STATUS_CODES[:created])

data/lib/applitools/core/eyes_base.rb

@@ -172,7 +172,7 @@ module Applitools
       raise e
     end
 
-    def check_window_base(region_provider, tag, ignore_mismatch, retry_timeout)
+    def check_window_base(region_provider, tag, ignore_mismatch, retry_timeout, options = {})
       if disabled?
         logger.info "#{__method__} Ignored"
         result = Applitools::MatchResults.new
@@ -207,7 +207,9 @@ module Applitools
         tag: tag,
         should_match_window_run_once_on_timeout: should_match_window_run_once_on_timeout,
         ignore_mismatch: ignore_mismatch,
-        retry_timeout: retry_timeout
+        retry_timeout: retry_timeout,
+        ignore: options[:ignore],
+        trim: options[:trim]
       )
       logger.info 'match_window done!'
 

data/lib/applitools/core/match_window_data.rb

@@ -19,7 +19,7 @@ module Applitools
     alias ignoreMismatch ignore_mismatch
 
     def to_hash
-      ary = [:userInputs, :appOutput, :tag, :ignoreMismatch].map do |field|
+      ary = [:userInputs, :appOutput, :tag, :ignoreMismatch, :options].map do |field|
         result = send(field)
         result = result.to_hash if result.respond_to? :to_hash
         [field, result] if [String, Symbol, Hash, Array, FalseClass, TrueClass].include? result.class

data/lib/applitools/core/match_window_task.rb

@@ -6,6 +6,18 @@ module Applitools
 
     attr_reader :logger, :running_session, :default_retry_timeout, :app_output_provider
 
+    class << self
+      def convert_coordinates(regions, screenshot)
+        regions.map() do |r|
+          screenshot.convert_region_location(
+            Applitools::Region.from_location_size(r.location, r.size),
+            Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative],
+            Applitools::EyesScreenshot::COORDINATE_TYPES[:screenshot_as_is]
+          ).to_hash
+        end
+      end
+    end
+
     def initialize(logger, running_session, retry_timeout, app_output_provider)
       @logger = logger
       @running_session = running_session
@@ -31,6 +43,8 @@ module Applitools
       should_match_window_run_once_on_timeout = options[:should_match_window_run_once_on_timeout]
       ignore_mismatch = options[:ignore_mismatch]
       retry_timeout = options[:retry_timeout]
+      ignore = options[:ignore] || []
+      trim = options[:trim] || false
 
       retry_timeout = default_retry_timeout if retry_timeout < 0
 
@@ -41,24 +55,24 @@ module Applitools
         sleep retry_timeout if should_match_window_run_once_on_timeout
         app_output = app_output_provider.app_output region_provider, last_screenshot
         match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag,
-          ignore_mismatch: ignore_mismatch
+          ignore_mismatch: ignore_mismatch, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
       else
         app_output = app_output_provider.app_output region_provider, last_screenshot
         start = Time.now
-        match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true
+        match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
         retry_time = Time.now - start
 
         while retry_time < retry_timeout && !match_result.as_expected?
           sleep MATCH_INTERVAL
           app_output = app_output_provider.app_output region_provider, last_screenshot
-          match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true
+          match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag, ignore_mismatch: true, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
           retry_time = Time.now - start
         end
 
         unless match_result.as_expected?
           app_output = app_output_provider.app_output region_provider, last_screenshot
           match_result = perform_match user_inputs: user_inputs, app_output: app_output, tag: tag,
-            ignore_mismatch: ignore_mismatch
+            ignore_mismatch: ignore_mismatch, ignore: self.class.convert_coordinates(ignore, app_output.screenshot), trim: trim
         end
       end
 
@@ -78,8 +92,14 @@ module Applitools
       tag = options[:tag]
       ignore_mismatch = options[:ignore_mismatch]
       data = Applitools::MatchWindowData.new user_inputs, app_output, tag, ignore_mismatch,
-        tag: tag, user_inputs: user_inputs, ignore_mismatch: ignore_mismatch, ignore_match: false,
-        force_mistmatch: false, force_match: false
+        tag: tag, user_inputs: user_inputs.to_hash, ignore_mismatch: ignore_mismatch, ignore_match: false,
+        force_mistmatch: false, force_match: false,
+        image_match_settings: {
+          ignore: options[:ignore]
+        },
+        trim: {
+          enabled: options[:trim]
+        }
       Applitools::Connectivity::ServerConnector.match_window running_session, data
     end
   end

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.2
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png