onlyoffice_webdriver_wrapper 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb66b9cb0b1d1d9c2c1b073c87c8448f219ab606167cf04fc07098fb1b9ab52c
-  data.tar.gz: dcc8a129fd4bb6c1bf03cb3c7512e02307b1c468a57692b0cccfaf367013a810
+  metadata.gz: 776391f3667781696f5c73f6b3839fa17ed3965deaaaa53e4c0717b4915f2ced
+  data.tar.gz: 5d9c932257c2e35e99464657ac3c00f8069a90d40bfc7ffc0d1e1c599ab3aee2
 SHA512:
-  metadata.gz: 9d291a4d9e4cb76071c29f99ff9e406aed808acadd2da20b8a4809da3104ec6787632a46049af95def7b6ea631a1a345f180e7313297089fc369d13ffa43eefe
-  data.tar.gz: 79450930ff1f94e966076dd0ad4c34ea8a88ca746b373dd6505dfc7f1f888b2cd8fb6deac3f2f96d46d763ead26d60dee27bddbe40e1a60540ff0cbc79f89052
+  metadata.gz: 15a1d5affae01a3e6857ec9b7b592e89f9007e841f7a4d9c83043c1fc020b1086f6d9b59594f94239a47469d727db095d83187a3e2f9e25fd2caba632d958dbc
+  data.tar.gz: d313861c4bda34d5452b95e9caaf29a53c13899f53d16fb95d699c98ead637311ff28b67b8533a7718f746c6eeb576f078a8dd6df211f48f6f88d62a97288326

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -4,6 +4,6 @@ module OnlyofficeWebdriverWrapper
   # Module for storing version data
   module Version
     # @return [String] Current stable version of gem
-    STRING = '1.8.0'
+    STRING = '1.8.1'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb

@@ -50,10 +50,8 @@ module OnlyofficeWebdriverWrapper
     # @return [nil]
     def click_on_locator_coordinates(xpath_name, right_by, down_by)
       wait_until_element_visible(xpath_name)
-      element = @driver.find_element(:xpath, xpath_name)
-      shift_to_zero = move_to_shift_to_top_left(xpath_name)
-      @driver.action.move_to(element, right_by.to_i - shift_to_zero.x, down_by.to_i - shift_to_zero.y).perform
-      @driver.action.move_to(element, right_by.to_i - shift_to_zero.x, down_by.to_i - shift_to_zero.y).click.perform
+      move_to_driver_action(xpath_name, right_by, down_by).perform
+      move_to_driver_action(xpath_name, right_by, down_by).click.perform
     end
 
     # Click on one of several which displayed
@@ -100,10 +98,8 @@ module OnlyofficeWebdriverWrapper
     # @return [nil]
     def right_click_on_locator_coordinates(xpath_name, right_by = nil, down_by = nil)
       wait_until_element_visible(xpath_name)
-      element = @driver.find_element(:xpath, xpath_name)
-      shift_to_zero = move_to_shift_to_top_left(xpath_name)
-      @driver.action.move_to(element, right_by.to_i - shift_to_zero.x, down_by.to_i - shift_to_zero.y).perform
-      @driver.action.move_to(element, right_by.to_i - shift_to_zero.x, down_by.to_i - shift_to_zero.y).context_click.perform
+      move_to_driver_action(xpath_name, right_by, down_by).perform
+      move_to_driver_action(xpath_name, right_by, down_by).context_click.perform
     end
 
     # Perform double_click on element
@@ -121,7 +117,7 @@ module OnlyofficeWebdriverWrapper
     # @return [nil]
     def double_click_on_locator_coordinates(xpath_name, right_by, down_by)
       wait_until_element_visible(xpath_name)
-      @driver.action.move_to(@driver.find_element(:xpath, xpath_name), right_by.to_i, down_by.to_i).double_click.perform
+      move_to_driver_action(xpath_name, right_by, down_by).double_click.perform
     end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_move_cursor_methods.rb

@@ -14,13 +14,9 @@ module OnlyofficeWebdriverWrapper
     # * +y2+ - shift vector y coordinate
     # * +mouse_release+ - release mouse after move
     def drag_and_drop(xpath, x1, y1, x2, y2, mouse_release: true)
-      canvas = get_element(xpath)
-      shift_to_zero = move_to_shift_to_top_left(xpath)
-      move_action = @driver.action
-                           .move_to(canvas, x1.to_i - shift_to_zero.x,
-                                    y1.to_i - shift_to_zero.y)
-                           .click_and_hold
-                           .move_by(x2, y2)
+      move_action = move_to_driver_action(xpath, x1, y1)
+                    .click_and_hold
+                    .move_by(x2, y2)
       move_action = move_action.release if mouse_release
 
       move_action.perform
@@ -56,12 +52,11 @@ module OnlyofficeWebdriverWrapper
     # @return [nil]
     def mouse_over(xpath_name, x_coordinate = 0, y_coordinate = 0)
       wait_until_element_present(xpath_name)
-      shift_to_zero = move_to_shift_to_top_left(xpath_name)
-      @driver.action.move_to(@driver.find_element(:xpath, xpath_name),
-                             x_coordinate.to_i - shift_to_zero.x,
-                             y_coordinate.to_i - shift_to_zero.y).perform
+      move_to_driver_action(xpath_name, x_coordinate, y_coordinate).perform
     end
 
+    private
+
     # Since v4.3.0 of `webdriver` gem `move_to` method is moving
     # from the center of the element
     # Add additional negative shift if this version is used
@@ -73,5 +68,18 @@ module OnlyofficeWebdriverWrapper
         Dimensions.new(0, 0)
       end
     end
+
+    # Generate action to move cursor to element
+    # @param [String] xpath xpath to move
+    # @param [Integer] right_by shift vector x coordinate
+    # @param [Integer] down_by shift vector y coordinate
+    # @return [Selenium::WebDriver::ActionBuilder] object to perform actions
+    def move_to_driver_action(xpath, right_by, down_by)
+      element = @driver.find_element(:xpath, xpath)
+      shift_to_zero = move_to_shift_to_top_left(xpath)
+      @driver.action.move_to(element,
+                             right_by.to_i - shift_to_zero.x,
+                             down_by.to_i - shift_to_zero.y)
+    end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -169,8 +169,7 @@ module OnlyofficeWebdriverWrapper
         set_style_attribute("#{xpath_name}/button", 'display', 'inline-block')
         set_style_attribute(xpath_name, 'display', 'block')
       else
-        shift_to_zero = move_to_shift_to_top_left(xpath_name)
-        @driver.action.move_to(element, horizontal_shift - shift_to_zero.x, vertical_shift - shift_to_zero.y).click.perform
+        move_to_driver_action(xpath_name, horizontal_shift, vertical_shift).click.perform
       end
     end
 
@@ -183,14 +182,11 @@ module OnlyofficeWebdriverWrapper
     # @return [void]
     def action_on_locator_coordinates(xpath_name, right_by, down_by, action = :click, times = 1)
       wait_until_element_visible(xpath_name)
-      element = @driver.find_element(:xpath, xpath_name)
-      shift_to_zero = move_to_shift_to_top_left(xpath_name)
-      (0...times).inject(@driver.action.move_to(element,
-                                                right_by.to_i - shift_to_zero.x,
-                                                down_by.to_i - shift_to_zero.y)) { |acc, _elem| acc.send(action) }.perform
+      (0...times).inject(move_to_driver_action(xpath_name, right_by, down_by)) { |acc, _elem| acc.send(action) }.perform
     end
 
     # Check if element present on page
+    # It may be visible or invisible, but should be present in DOM tree
     # @param [String] xpath_name to find element
     # @return [Boolean] result of check
     def element_present?(xpath_name)
@@ -248,6 +244,7 @@ module OnlyofficeWebdriverWrapper
     end
 
     # Check if element visible on page
+    # It should be part of DOM and should be visible on current visible part of page
     # @param [String] xpath_name element to find
     # @return [Boolean] result of check
     def element_visible?(xpath_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless