eyes_selenium 2.28.0 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd372027171990f6c9d885f7a7e00f65a0899d31
-  data.tar.gz: f93869d827f4cf50963cf7148cf63cc9df762b09
+  metadata.gz: 8eb600a1b703d7494ac2ef3c062e8d8c5d3110e1
+  data.tar.gz: f8bd75c7a205a4ee88f123bfa526d6794467f988
 SHA512:
-  metadata.gz: 2bf6b04cf2138f1714dd20d4720fe23d19dc311a9bbe24593c04263317063d298cf83771917354505870034f1fbea4430eb56944d96658ecc3dfeec0f7e7f32d
-  data.tar.gz: 345cfaffd6a3c34f9d64de2cb07f878dd190034f07438c4250e0bc0a1fd3291d4b55a07fb033f84a94a467a9d2ab038cfdccc5c1cc3d5a1d6a69a26b78b0186f
+  metadata.gz: 40197eea7129826dcc60433694c50433a581e6fb17438fbfe05252ca6f88c2b8b2c16a76478e45a8b0f27c1632ef48a2228d4a309516a8c35d82a13120a7b10c
+  data.tar.gz: 5a1c9b42716c731c3bb8ee32a912f13d7560c6c411a59d547a7cdbe87df101a0631b3ef3b62de01f39cc32c7e44837eec9c47226e5f6ae52a7f018c78aadc2d1

data/lib/applitools/eyes.rb

@@ -195,29 +195,39 @@ class Applitools::Eyes
       Applitools::EyesLogger.debug 'Done!'
     end
 
-    if how == :element
-      Applitools::EyesLogger.debug 'Element given as an argument...'
-      raise Applitools::EyesError.new('Element does not exist') if what.nil?
-      element_to_check = what
-    else
-      Applitools::EyesLogger.debug 'Finding element...'
-      element_to_check = driver.find_element(how, what)
-    end
+    original_overflow = driver.hide_scrollbars if hide_scrollbars
+    begin
+      if how == :element
+        Applitools::EyesLogger.debug 'Element given as an argument...'
+        raise Applitools::EyesError.new('Element does not exist') if what.nil?
+        element_to_check = what
+      else
+        Applitools::EyesLogger.debug 'Finding element...'
+        element_to_check = driver.find_element(how, what)
+      end
 
-    Applitools::EyesLogger.debug 'Done! Getting element location...'
-    location = element_to_check.location
-    Applitools::EyesLogger.debug 'Done! Getting element size...'
-    size = element_to_check.size
-    raise Applitools::EyesError.new("Invalid region size: #{size}") if size.width <= 0 || size.height <= 0
-    Applitools::EyesLogger.debug 'Done! Creating region...'
-    region = Applitools::Base::Region.new(location.x, location.y, size.width, size.height)
-    Applitools::EyesLogger.debug "Done! Checking region... #{region}"
-    check_region_(region, tag, specific_timeout)
-    Applitools::EyesLogger.debug 'Done!'
+      Applitools::EyesLogger.debug 'Done! Getting element location...'
+      location = element_to_check.location
+      Applitools::EyesLogger.debug 'Done! Getting element size...'
+      size = element_to_check.size
+      raise Applitools::EyesError.new("Invalid region size: #{size}") if size.width <= 0 || size.height <= 0
+      Applitools::EyesLogger.debug 'Done! Creating region...'
+      region = Applitools::Base::Region.new(location.x, location.y, size.width, size.height)
+      Applitools::EyesLogger.debug "Done! Checking region... #{region}"
+      check_region_(region, tag, specific_timeout)
+      Applitools::EyesLogger.debug 'Done!'
+    ensure
+      driver.set_overflow(original_overflow) if hide_scrollbars
+    end
   end
 
   def check_window(tag = nil, specific_timeout = -1)
-    check_region_(Applitools::Base::Region::EMPTY, tag, specific_timeout)
+    original_overflow = driver.hide_scrollbars if hide_scrollbars
+    begin
+      check_region_(Applitools::Base::Region::EMPTY, tag, specific_timeout)
+    ensure
+      driver.set_overflow(original_overflow) if hide_scrollbars
+    end
   end
 
   def close(raise_ex = true)

data/lib/applitools/selenium/browser.rb

@@ -119,11 +119,17 @@ module Applitools::Selenium
       execute_script(JS_SET_TRANSFORM % { transform: transform }, 0.25)
     end
 
+    ## Set the overflow value for document element and return the original overflow value.
     def set_overflow(overflow)
       execute_script(JS_SET_OVERFLOW % { overflow: overflow }, 0.1)
     end
     # rubocop:enable Style/AccessorMethodName
 
+    ## Hide the main document's scrollbars and returns the original overflow value.
+    def hide_scrollbars
+      set_overflow(OVERFLOW_HIDDEN)
+    end
+
     def translate_to(point)
       set_transform("translate(-#{point.left}px, -#{point.top}px)")
     end
@@ -142,9 +148,6 @@ module Applitools::Selenium
         translate_to(Applitools::Base::Point::TOP_LEFT)
       end
 
-      # Hide scrollbars.
-      original_overflow = set_overflow(OVERFLOW_HIDDEN) if @eyes.hide_scrollbars
-
       # Take screenshot of the (0,0) tile.
       screenshot = @driver.visible_screenshot
 
@@ -182,7 +185,6 @@ module Applitools::Selenium
         screenshot = Applitools::Utils::ImageUtils.stitch_images(page_size, parts)
       end
 
-      set_overflow(original_overflow) if @eyes.hide_scrollbars
       set_transform(original_transform) if @eyes.use_css_transition
 
       scroll_to(original_scroll_position)

data/lib/applitools/selenium/driver.rb

@@ -73,6 +73,16 @@ module Applitools::Selenium
       @is_mobile_device
     end
 
+    ## Hide the main document's scrollbars and returns the original overflow value.
+    def hide_scrollbars
+      @browser.hide_scrollbars
+    end
+
+    ## Set the overflow value for document element and return the original overflow value.
+    def set_overflow(overflow)
+      @browser.set_overflow(overflow)
+    end
+
     # Return a PNG screenshot in the given format as a string
     #
     # +output_type+:: +Symbol+ The format of the screenshot. Accepted values are +:base64+ and +:png+.

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.28.0'.freeze
+  VERSION = '2.29.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.29.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver