eyes_selenium 3.5.4 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ecd05304907f838ab10bde703febf1503ec173f
-  data.tar.gz: e4556c4df183806a9e107c6906ca74c097fe426e
+  metadata.gz: 30fb1a9d398f42edc43b8f3b6d32a39f844b4941
+  data.tar.gz: c112d73ecafabae62c6f06338104c53d1af1c2b5
 SHA512:
-  metadata.gz: a50b765b3d3319cb007712ac2b8bd9c823faffd6aeed745ef5ce6f22eb6e8f0798e85eb47423bc698c12a80f805c18770ee0c72ed939bc41d0b49bbead8aebc6
-  data.tar.gz: aad5dc13c8e202295e4f0c71a281316f70e709f4ee2e09da5931eae71bf029b14cc4ef0d0f99797b45f46efff50d0178f9b859545871bc3e6caca9a57709e6de
+  metadata.gz: 9a3f134e50c08325fcace7d6dbb728247e051086f15ffe37079c2a8cc7b6dca278ba229b985e2d255524e1b8cb384882d1e88ce1c6828b121bdc1a422712115a
+  data.tar.gz: 0f0e2f9ecaf9f0ff912a32f28ce2240373fdeb953f7bbd4af46c2395321575ce74e25efee7dc879b35132583408cbe292428fd77a792afb7393561073ca73118

data/lib/applitools/selenium/css_translate_position_provider.rb

@@ -6,10 +6,12 @@ module Applitools::Selenium
 
     attr_accessor :last_state_position
 
-    def initialize(executor, disable_horizontal = false, disable_vertical = false)
+    def initialize(executor, disable_horizontal = false, disable_vertical = false, max_width: nil, max_height: nil)
       self.executor = executor
       self.disable_horizontal = disable_horizontal
       self.disable_vertical = disable_vertical
+      self.max_width = max_width
+      self.max_height = max_height
     end
 
     def current_position
@@ -48,16 +50,19 @@ module Applitools::Selenium
 
     def entire_size
       viewport_size = Applitools::Utils::EyesSeleniumUtils.extract_viewport_size(executor)
-      e_size = Applitools::Utils::EyesSeleniumUtils.current_frame_content_entire_size(executor)
-      logger.info "Entire size: #{e_size}"
-      e_size.width = viewport_size.width if disable_horizontal
-      e_size.height = viewport_size.height if disable_vertical
-      e_size
+      result = Applitools::Utils::EyesSeleniumUtils.current_frame_content_entire_size(executor)
+      logger.info "Entire size: #{result}"
+      result.width = viewport_size.width if disable_horizontal
+      result.height = viewport_size.height if disable_vertical
+      result.width = max_width unless max_width.nil?
+      result.height = max_height unless max_height.nil?
+      logger.info "Actual size to scroll: #{result}"
+      result
     end
 
     private
 
-    attr_accessor :executor, :disable_horizontal, :disable_vertical
+    attr_accessor :executor, :disable_horizontal, :disable_vertical, :max_width, :max_height
 
     def get_position_from_transform(transform)
       regexp = /^translate\(\s*(\-?)(\d+)px,\s*(\-?)(\d+)px\s*\)/

data/lib/applitools/selenium/eyes.rb

@@ -71,10 +71,13 @@ module Applitools::Selenium
     #   When :CSS - SDK will use CSS transitions to perform scrolling, otherwise it will use Javascript
     #   window.scroll_to() function for scrolling purposes
     #   @return [boolean] stitch_mode (:CSS or :SCROLL)
+    # @!attribute [Applitools::RectangleSize] explicit_entire_size
+    #   May be set to an Applitools::RectangleSize instance or +nil+ (default).
+    #   @return [Applitools::RectangleSize] explicit_entire_size
 
     attr_accessor :base_agent_id, :screenshot, :force_full_page_screenshot, :hide_scrollbars,
       :wait_before_screenshots, :debug_screenshot, :stitch_mode, :disable_horizontal_scrolling,
-      :disable_vertical_scrolling
+      :disable_vertical_scrolling, :explicit_entire_size
     attr_reader :driver
 
     def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
@@ -97,6 +100,7 @@ module Applitools::Selenium
       self.debug_screenshot = false
       self.disable_horizontal_scrolling = false
       self.disable_vertical_scrolling = false
+      self.explicit_entire_size = nil
     end
 
     # Starts a test
@@ -140,7 +144,7 @@ module Applitools::Selenium
       self.device_pixel_ratio = UNKNOWN_DEVICE_PIXEL_RATIO
 
       self.position_provider = self.class.position_provider(
-        stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling
+        stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
       )
 
       self.eyes_screenshot_factory = lambda do |image|
@@ -157,7 +161,7 @@ module Applitools::Selenium
       @stitch_mode = value.to_s.upcase == STICH_MODE[:css].to_s ? STICH_MODE[:css] : STICH_MODE[:scroll]
       unless driver.nil?
         self.position_provider = self.class.position_provider(
-          stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling
+          stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
         )
       end
       if stitch_mode == STICH_MODE[:css]
@@ -199,7 +203,13 @@ module Applitools::Selenium
         )
       end
 
-      check_window_base region_provider, tag, false, match_timeout, match_level: default_match_settings[:match_level]
+      match_data = Applitools::MatchWindowData.new.tap do |d|
+        d.tag = tag
+        d.ignore_mismatch = false
+        d.match_level = default_match_settings[:match_level]
+      end
+
+      check_window_base region_provider, match_timeout, match_data
     end
 
     # @!visibility private
@@ -232,6 +242,10 @@ module Applitools::Selenium
 
       check_in_frame target_frames: target.frames do
         begin
+          match_data = Applitools::MatchWindowData.new
+          match_data.tag = name
+          match_data.match_level = default_match_settings[:match_level]
+          match_data.read_target(target, driver)
           eyes_element = target.region_to_check.call(driver)
           region_visibility_strategy.move_to_region original_position_provider,
             Applitools::Location.new(eyes_element.location.x.to_i, eyes_element.location.y.to_i)
@@ -274,11 +288,7 @@ module Applitools::Selenium
           end
 
           check_window_base(
-            region_provider, name, false, target.options[:timeout] || USE_DEFAULT_MATCH_TIMEOUT,
-            ignore: target.ignored_regions.map { |i| i.call(driver) },
-            trim: target.options[:trim],
-            match_level: default_match_settings[:match_level],
-            exact: default_match_settings[:exact]
+            region_provider, target.options[:timeout] || USE_DEFAULT_MATCH_TIMEOUT, match_data
           )
         ensure
           eyes_element.overflow = original_overflow unless original_overflow.nil?
@@ -865,7 +875,13 @@ module Applitools::Selenium
         )
       end
 
-      check_window_base region_provider, tag, false, match_timeout, match_level: default_match_settings[:match_level]
+      match_data = Applitools::MatchWindowData.new.tap do |d|
+        d.tag = tag
+        d.ignore_mismatch = false
+        d.match_level = default_match_settings[:match_level]
+      end
+
+      check_window_base region_provider, match_timeout, match_data
     end
 
     def app_environment
@@ -947,8 +963,14 @@ module Applitools::Selenium
         Applitools::Selenium::EyesWebDriverScreenshot.new(image, driver: driver)
       end
 
+      match_data = Applitools::MatchWindowData.new.tap do |d|
+        d.tag = tag
+        d.ignore_mismatch = false
+        d.match_level = default_match_settings[:match_level]
+      end
+
       result = check_window_base(
-        region_provider, tag, false, match_timeout, match_level: default_match_settings[:match_level]
+        region_provider, match_timeout, match_data
       )
 
       logger.info 'Done! trying to scroll back to original position...'
@@ -1044,8 +1066,14 @@ module Applitools::Selenium
           )
         end
 
+        match_data = Applitools::MatchWindowData.new.tap do |d|
+          d.tag = tag
+          d.ignore_mismatch = false
+          d.match_level = default_match_settings[:match_level]
+        end
+
         check_window_base(
-          base_check_region_provider, tag, false, match_timeout, match_level: default_match_settings[:match_level]
+          base_check_region_provider, match_timeout, match_data
         )
       ensure
         eyes_element.overflow = original_overflow unless original_overflow.nil?
@@ -1083,12 +1111,19 @@ module Applitools::Selenium
     end
 
     class << self
-      def position_provider(stitch_mode, driver, disable_horizontal = false, disable_vertical = false)
+      def position_provider(stitch_mode, driver, disable_horizontal=false, disable_vertical=false, explicit_entire_size=nil)
+        max_width, max_height = nil, nil
+        unless explicit_entire_size.nil?
+          max_width = explicit_entire_size.width
+          max_height = explicit_entire_size.height
+        end
         case stitch_mode
         when :SCROLL
-          Applitools::Selenium::ScrollPositionProvider.new(driver, disable_horizontal, disable_vertical)
+          Applitools::Selenium::ScrollPositionProvider.new(driver, disable_horizontal, disable_vertical,
+                                                           max_width: max_width, max_height: max_height)
         when :CSS
-          Applitools::Selenium::CssTranslatePositionProvider.new(driver, disable_horizontal, disable_vertical)
+          Applitools::Selenium::CssTranslatePositionProvider.new(driver, disable_horizontal, disable_vertical,
+                                                                 max_width: max_width, max_height: max_height)
         end
       end
     end

data/lib/applitools/selenium/scroll_position_provider.rb

@@ -5,10 +5,12 @@ module Applitools::Selenium
 
     def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
 
-    def initialize(executor, disable_horizontal = false, disable_vertical = false)
+    def initialize(executor, disable_horizontal = false, disable_vertical = false, max_width: nil, max_height: nil)
       self.executor = executor
       self.disable_horizontal = disable_horizontal
       self.disable_vertical = disable_vertical
+      self.max_width = max_width
+      self.max_height = max_height
     end
 
     # The scroll position of the current frame
@@ -43,6 +45,9 @@ module Applitools::Selenium
       logger.info "Entire size: #{result}"
       result.width = viewport_size.width if disable_horizontal
       result.height = viewport_size.height if disable_vertical
+      result.width = max_width unless max_width.nil?
+      result.height = max_height unless max_height.nil?
+      logger.info "Actual size to scroll: #{result}"
       result
     end
 
@@ -52,6 +57,6 @@ module Applitools::Selenium
 
     private
 
-    attr_accessor :executor, :disable_horizontal, :disable_vertical
+    attr_accessor :executor, :disable_horizontal, :disable_vertical, :max_width, :max_height
   end
 end

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.5.4'.freeze
+  VERSION = '3.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.4
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.6.4
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement