eyes_core 3.14.3 → 3.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d9bf7c4a1a591be9f9e5a4fa1f97b5f6d89fdf1
-  data.tar.gz: b46c22f0b9a08fe8e7f1e768306bb787a6bf026c
+SHA256:
+  metadata.gz: fe32cd2c89eaeca5364e583f6c0027484463d2bd37ad1d9f510f09df4dbafbf7
+  data.tar.gz: 86db35f1492c056b6d191c9bee530306e14fea703e3ca2be411e6ea64790c7e1
 SHA512:
-  metadata.gz: 117dc8fdfc6a5dad6576c2d120ffc6d8fcde6c290eab3c5452e606d437fbd74900426148a16940b4897d0be9c90346ab42718708a976a33da24fb7fd89a07b77
-  data.tar.gz: 05340e98ffa98f3fcc433329c4bef32acafadd12c6cb39c0bf429a2cb37f2a1caf9c169047d71bbf32ee568712dd5a244c061e7c35792613fe5fe03fd9292592
+  metadata.gz: 0b62c4b68937b383566c02f975296acb3dcebd5548f6db821b2e3856ead3a71f26be77c35b64c3f30848a958bb5f920588eeb99fa9f897c6b9e1172496da0780
+  data.tar.gz: c5475b5a9be55894f4caf6ee63e01b44626209f553e17161797c7a27dc17f91c6b67c9b30b0342a4f5f3715f76bdb5f08761ee76a79f3975192b2043b49bde5c

data/ext/eyes_core/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 $CFLAGS << ' -Wall'
 create_makefile('eyes_core/eyes_core')

data/ext/eyes_core/eyes_core.c

@@ -11,8 +11,8 @@ VALUE c_resampling_first_step(VALUE self, VALUE dst_dimension_x, VALUE dst_dimen
     unsigned long int source_width, source_height, c_dst_dimension_x, c_dst_dimension_y, w_m, h_m;
     VALUE result_array;
 
-    source_width = NUM2UINT(rb_funcall(self, rb_intern("width"), 0, NULL));
-    source_height = NUM2UINT(rb_funcall(self, rb_intern("height"), 0, NULL));
+    source_width = NUM2UINT(rb_funcall(self, rb_intern("width"), 0));
+    source_height = NUM2UINT(rb_funcall(self, rb_intern("height"), 0));
 
     c_dst_dimension_x = NUM2UINT(dst_dimension_x);
     c_dst_dimension_y = NUM2UINT(dst_dimension_y);
@@ -57,9 +57,9 @@ PIXEL* get_c_array(VALUE self) {
   PIXEL* ary;
   VALUE pixels;
 
-  pixels = rb_funcall(self, rb_intern("pixels"), 0, NULL);
-  w = NUM2UINT(rb_funcall(self, rb_intern("width"), 0, NULL));
-  h = NUM2UINT(rb_funcall(self, rb_intern("height"), 0, NULL));
+  pixels = rb_funcall(self, rb_intern("pixels"), 0);
+  w = NUM2UINT(rb_funcall(self, rb_intern("width"), 0));
+  h = NUM2UINT(rb_funcall(self, rb_intern("height"), 0));
   ary = (PIXEL*)malloc( w*h*sizeof(PIXEL));
 
   for(i=0; i<w*h; i++) {
@@ -95,8 +95,8 @@ BYTE interpolate_char(double t, BYTE c0, BYTE c1, BYTE c2, BYTE c3) {
   return (BYTE)(res);
 };
 
-PIXEL raw_merge_pixels(PIXEL* merge_pixels, unsigned int size) {
-  unsigned int i, real_colors, acum_r, acum_g, acum_b, acum_a;
+PIXEL raw_merge_pixels(PIXEL* merge_pixels, unsigned long int size) {
+  unsigned long int i, real_colors, acum_r, acum_g, acum_b, acum_a;
   BYTE new_r, new_g, new_b, new_a;
   PIXEL pix;
 

data/ext/eyes_core/eyes_core.h

@@ -13,11 +13,6 @@ typedef unsigned char BYTE; // Bytes use 8 bits unsigned integers
 #define BUILD_PIXEL(r, g, b, a)  (((PIXEL) (r) << 24) + ((PIXEL) (g) << 16) + ((PIXEL) (b) << 8) + (PIXEL) (a))
 #define INT8_MULTIPLY(a, b)      (((((a) * (b) + 0x80) >> 8) + ((a) * (b) + 0x80)) >> 8)
 
-
-
-void Init_resampling();
-
-
 BYTE interpolate_char(double, BYTE, BYTE, BYTE, BYTE);
 
 PIXEL* get_bicubic_points(PIXEL*, unsigned long int, unsigned long int, unsigned long int, unsigned long int);
@@ -27,7 +22,7 @@ VALUE c_resampling_first_step(VALUE, VALUE, VALUE);
 VALUE get_ruby_array(VALUE, PIXEL*, unsigned long int);
 PIXEL get_line_pixel(PIXEL*, unsigned long int, long int, unsigned long int);
 PIXEL get_column_pixel(PIXEL*, unsigned long int, long int, unsigned long int, unsigned long int);
-PIXEL raw_merge_pixels(PIXEL*, unsigned int);
+PIXEL raw_merge_pixels(PIXEL*, unsigned long int);
 PIXEL* c_scale_points(PIXEL*, unsigned long int, unsigned long int, unsigned long int, unsigned long int);
 
 #endif

data/lib/applitools/appium/eyes.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: false
+
+module Applitools::Appium
+  module Eyes
+    def perform_driver_settings_for_appium_driver
+      self.region_visibility_strategy = Applitools::Selenium::NopRegionVisibilityStrategy.new
+      self.force_driver_resolution_as_viewport_size = true
+    end
+
+    private :perform_driver_settings_for_appium_driver
+  end
+end

data/lib/applitools/appium/initialize_1.9.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: false
+
+module Applitools::Appium
+  module Init19
+    extend self
+
+    def init
+      Applitools::Utils::EyesSeleniumUtils.module_eval do
+        alias_method :super_mobile_device?, :mobile_device?
+        alias_method :super_android?, :android?
+        alias_method :super_ios?, :ios?
+        alias_method :super_platform_version, :platform_version
+        alias_method :super_current_scroll_position, :current_scroll_position
+        include Applitools::Appium::Utils
+      end
+
+      Applitools::Selenium::Eyes.class_eval do
+        include Applitools::Appium::Eyes
+      end
+    end
+  end
+end

data/lib/applitools/appium/initialize_2.0.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: false
+
+module Applitools::Appium
+  module Init20
+    extend self
+    def init
+      Applitools::Utils::EyesSeleniumUtils.module_eval do
+        prepend Applitools::Appium::Utils
+        extend self
+      end
+
+      Applitools::Selenium::Eyes.class_eval do
+        prepend Applitools::Appium::Eyes
+      end
+    end
+  end
+end

data/lib/applitools/appium/utils.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: false
+
+module Applitools::Appium
+  module 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)
+    end
+
+    # true if test is running on Android device
+    def android?(driver)
+      driver.respond_to?(:appium_device) && driver.appium_device == :android
+    end
+
+    # true if test is running on iOS device
+    def ios?(driver)
+      driver.respond_to?(:appium_device) && driver.appium_device == :ios
+    end
+
+    # @param [Applitools::Selenium::Driver] driver
+    def platform_version(driver)
+      driver.respond_to?(:caps) && driver.caps[:platformVersion]
+    end
+
+    # def current_position
+    #   result = nil
+    #   begin
+    #     logger.info 'current_position()'
+    #     result = Applitools::Utils::EyesSeleniumUtils.current_scroll_position(executor)
+    #     logger.info "Current position: #{result}"
+    #   rescue Applitools::EyesDriverOperationException
+    #     result = Applitools::Location::TOP_LEFT
+    #   end
+    #   result
+    # end
+
+    def current_scroll_position(driver)
+      super
+    rescue
+      Applitools::Location::TOP_LEFT
+    end
+  end
+end

data/lib/applitools/calabash/calabash_element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     class CalabashElement

data/lib/applitools/calabash/calabash_screenshot_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     class CalabashScreenshotProvider

data/lib/applitools/calabash/environment_detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     module EnvironmentDetector

data/lib/applitools/calabash/eyes.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: false
+
 module Applitools
   module Calabash
     class Eyes < Applitools::EyesBase
       attr_accessor :device_pixel_ratio, :full_page_capture_algorithm, :base_agent_id, :title,
-        :debug_screenshot, :debug_screenshot_provider, :tag_for_debug
+        :debug_screenshots, :debug_screenshot_provider, :tag_for_debug
       attr_reader :context
 
       def initialize(server_url = Applitools::Connectivity::ServerConnector::DEFAULT_SERVER_URL)
         super
         self.base_agent_id = "eyes.calabash.ruby/#{Applitools::VERSION}".freeze
-        self.debug_screenshot = false
+        self.debug_screenshots = false
         self.debug_screenshot_provider = Applitools::DebugScreenshotProvider.new
                                                                             .tag_access { tag_for_debug }
-                                                                            .debug_flag_access { debug_screenshot }
+                                                                            .debug_flag_access { debug_screenshots }
       end
 
       def open(options = {})

data/lib/applitools/calabash/eyes_calabash_android_screenshot.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'eyes_calabash_screenshot'
 module Applitools
   module Calabash
     class EyesCalabashAndroidScreenshot < ::Applitools::Calabash::EyesCalabashScreenshot
+      extend Forwardable
+      def_delegators 'Applitools::EyesLogger', :logger
+
       ANDROID_DENSITY = {
         120 => 0.75,
         160 => 1,
@@ -9,9 +14,14 @@ module Applitools
         240 => 1.5,
         320 => 2,
         480 => 3,
+        560 => 3.5,
         640 => 4
       }.freeze
 
+      DENSITY_DEFAULT = 160
+
+      class UnknownDeviceDensity < ::Applitools::EyesError; end
+
       def initialize(*args)
         options = if args.last.is_a? Hash
                     args.pop
@@ -49,8 +59,9 @@ module Applitools
       end
 
       def density=(value)
-        raise Applitools::EyesIllegalArgument, "Unknown density = #{value}" unless ANDROID_DENSITY[value.to_i]
-        @scale_factor = ANDROID_DENSITY[value.to_i]
+        logger.warn("Trying to set unknown device density - #{value}") unless
+            ANDROID_DENSITY.keys.include?(value.to_i)
+        @scale_factor = value.to_f / DENSITY_DEFAULT
       end
     end
   end

data/lib/applitools/calabash/eyes_calabash_ios_screenshot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'eyes_calabash_screenshot'
 module Applitools
   module Calabash

data/lib/applitools/calabash/eyes_calabash_screenshot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module Applitools
   module Calabash
     class EyesCalabashScreenshot < Applitools::EyesScreenshot

data/lib/applitools/calabash/eyes_hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if respond_to?(:Before)
   Before('@eyes') do |scenario|
     get_scenario_tags(scenario)

data/lib/applitools/calabash/eyes_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 require 'securerandom'
 module Applitools

data/lib/applitools/calabash/full_page_capture_algorithm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Applitools::Calabash.require_dir 'calabash/full_page_capture_algorithm'
 
 module Applitools

data/lib/applitools/calabash/full_page_capture_algorithm/android_scroll_view.rb

@@ -1,8 +1,18 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 module Applitools
   module Calabash
     module FullPageCaptureAlgorithm
+      module CalabashAndroidScreenshot
+        def calabash_android_screenshot(screenshot, density)
+          Applitools::Calabash::EyesCalabashAndroidScreenshot.new(
+            screenshot, density: density
+          )
+        end
+      end
       class AndroidScrollView < Base
+        include CalabashAndroidScreenshot
         def initialize(*args)
           super
           @entire_content = nil
@@ -29,9 +39,9 @@ module Applitools
 
           restore_original_position
 
-          Applitools::Calabash::EyesCalabashAndroidScreenshot.new(
+          calabash_android_screenshot(
             Applitools::Screenshot.from_image(stitched_image),
-            density: screenshot_provider.density
+            screenshot_provider.density
           )
         end
 

data/lib/applitools/calabash/full_page_capture_algorithm/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     module FullPageCaptureAlgorithm

data/lib/applitools/calabash/full_page_capture_algorithm/ios_ui_table_view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module Applitools

data/lib/applitools/calabash/os_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     module OsVersions

data/lib/applitools/calabash/rspec_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 
 RSpec::Matchers.define :match_baseline do |expected|

data/lib/applitools/calabash/steps/android_eyes_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^set OS$/) do
   sdk_version = begin
                   perform_action('android_sdk_version')

data/lib/applitools/calabash/steps/android_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^ignore status bar$/) do
   raise Applitools::EyesError, '@target is not set' unless @target
   step %(query element "view id:'statusBarBackground'")

data/lib/applitools/calabash/steps/eyes_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^create eyes$/) do
   eyes_settings = Applitools::Calabash::EyesSettings.instance
   eyes_settings.eyes ||= Applitools::Calabash::Eyes.new.tap do |eyes|

data/lib/applitools/calabash/steps/eyes_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Given(/^eyes application name is "([^"]*)"$/) do |name|
   Applitools::Calabash::EyesSettings.instance.app_name = name
 end

data/lib/applitools/calabash/steps/ios_eyes_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^set OS$/) do
   Applitools::Calabash::EyesSettings.instance.eyes.host_os = "iOS #{default_device.ios_major_version}"
 end

data/lib/applitools/calabash/steps/ios_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^the whole screen should match a baseline/) do
   step %(create target)
   step %(target should match a baseline)

data/lib/applitools/calabash/steps/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then(/^create target$/) do
   @target = nil
   @target = Applitools::Calabash::Target.new

data/lib/applitools/calabash/target.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     class Target

data/lib/applitools/calabash/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Applitools
   module Calabash
     module Utils

data/lib/applitools/calabash_steps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Applitools::Calabash.require_environment(
   'applitools/calabash/steps/matchers',
   Applitools::Calabash::EnvironmentDetector.current_environment

data/lib/applitools/capybara/capybara_settings.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Applitools
+  module Selenium
+    module Capybara
+      module CapybaraSettings
+        # Registers Capybara driver which will be used by eyes and sets it as default Capybara driver.
+        # The name of the driver is :eyes, and the driver is a descendant of class Capybara::Selenium::Driver.
+        # Options are eventually passed to drivers constructor
+        # @param [Hash] options
+        # @example
+        #   Applitools.register_capybara_driver :browser => :chrome
+        # @example
+        #   Applitools.register_capybara_driver :browser => :remote, :url => 'remote_url', :desired_capabilities => {}
+        def register_capybara_driver(options = {})
+          ::Capybara.register_driver :eyes do |app|
+            Applitools::Selenium::Capybara::Driver.new app, options
+          end
+          ::Capybara.default_driver = :eyes
+          ::Capybara.javascript_driver = :eyes
+        end
+      end
+    end
+  end
+end