onlyoffice_webdriver_wrapper 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b6744e1acea477bcbfce6af74b2eaab02864d6985be19be496ab26c7a66208
-  data.tar.gz: 7c2c0b68f14012ccb7f95f3a6f2d7698f12e83a8f06cdd0f48382037cdf33d9c
+  metadata.gz: 6dc61124365371ac4e24646ae4333ae1a590a6e2b0cf8c477c093e335e5d249f
+  data.tar.gz: cba7d248075d58ebc1249166f684a92ca695b359b3e2e2472e3cc1cbe2ea84da
 SHA512:
-  metadata.gz: 06ab15b74f6d81bdcb0fda5b6893465cff70499ab72f68d3483b4aeec91d8abf7f4ae653a650b8b8f5ac7d69d2e75b5c78017d45f2ca795110b40920725fe1c5
-  data.tar.gz: 55c083c94d1d1ead6acccb73244131670a0796cb2927424c123b557aee2c67e00b4e5f5266ae16657c1250e89fe243dd6ccf36638fbdb938f950fe447e472c73
+  metadata.gz: dc5c7c14c73b7ed444ee5f5f1278867199b13b5b2b6a30e9cd0e0018c0456e79d8a029cc7e4a5ce578588e2af4a9f63ad0f890e337338bc9b634d3212931d71a
+  data.tar.gz: 6283edb3f3b215c3c6aea865e7aaaa9ed2908374a2325d1eb7eda334e72325b07c9aa6a93929b809f895c7e28b9aba1676808ca79dba5329cb8b17a012deef0b

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/{headless_screenshot_patch.rb → headless_patch.rb}

@@ -21,3 +21,26 @@ class Headless
     end
   end
 end
+
+# Until https://github.com/leonid-shevtsov/headless/pull/106
+# is released in stable version
+class Headless
+  # Class for handling video records
+  class VideoRecorder
+    # Stop recording and save it
+    # @param [String] path to save
+    # @retunr [nil, String] path to result file or nil if error
+    def stop_and_save(path)
+      CliUtil.kill_process(@pid_file_path, :wait => true)
+      if File.exist? @tmp_file_path
+        begin
+          FileUtils.mkdir_p(File.dirname(path))
+          FileUtils.mv(@tmp_file_path, path)
+        rescue Errno::EINVAL
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb

@@ -3,7 +3,7 @@
 require_relative 'headless_helper/real_display_tools'
 require_relative 'headless_helper/ruby_helper'
 require 'headless'
-require_relative 'headless_helper/headless_screenshot_patch'
+require_relative 'headless_helper/headless_patch'
 require_relative 'headless_helper/headless_video_recorder'
 
 module OnlyofficeWebdriverWrapper

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.6.0'
+    STRING = '1.7.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb

@@ -51,8 +51,9 @@ module OnlyofficeWebdriverWrapper
     def click_on_locator_coordinates(xpath_name, right_by, down_by)
       wait_until_element_visible(xpath_name)
       element = @driver.find_element(:xpath, xpath_name)
-      @driver.action.move_to(element, right_by.to_i, down_by.to_i).perform
-      @driver.action.move_to(element, right_by.to_i, down_by.to_i).click.perform
+      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
     end
 
     # Click on one of several which displayed
@@ -100,8 +101,9 @@ module OnlyofficeWebdriverWrapper
     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)
-      @driver.action.move_to(element, right_by.to_i, down_by.to_i).perform
-      @driver.action.move_to(element, right_by.to_i, down_by.to_i).context_click.perform
+      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
     end
 
     # Perform double_click on element

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_move_cursor_methods.rb

@@ -15,9 +15,10 @@ module OnlyofficeWebdriverWrapper
     # * +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, y1.to_i)
+                           .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_action.release if mouse_release
@@ -33,15 +34,10 @@ module OnlyofficeWebdriverWrapper
     # * +right_by+ - shift vector x coordinate
     # * +down_by+ - shift vector y coordinate
     def drag_and_drop_by(source, right_by, down_by = 0)
-      @driver.action.drag_and_drop_by(get_element(source), right_by, down_by).perform
-    end
-
-    # Move cursor to element
-    # @param [String, Selenium::WebDriver::Element] element xpath or webdriver element
-    # @return [nil]
-    def move_to_element(element)
-      element = get_element(element) if element.is_a?(String)
-      @driver.action.move_to(element).perform
+      shift_to_zero = move_to_shift_to_top_left(source)
+      @driver.action.drag_and_drop_by(get_element(source),
+                                      right_by - shift_to_zero.x,
+                                      down_by - shift_to_zero.y).perform
     end
 
     # Move cursor to element
@@ -60,7 +56,22 @@ module OnlyofficeWebdriverWrapper
     # @return [nil]
     def mouse_over(xpath_name, x_coordinate = 0, y_coordinate = 0)
       wait_until_element_present(xpath_name)
-      @driver.action.move_to(@driver.find_element(:xpath, xpath_name), x_coordinate.to_i, y_coordinate.to_i).perform
+      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
+    end
+
+    # 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
+    def move_to_shift_to_top_left(xpath)
+      if Gem.loaded_specs['selenium-webdriver'].version >= Gem::Version.new('4.3.0')
+        element_size = element_size_by_js(xpath)
+        Dimensions.new(element_size.x / 2, element_size.y / 2)
+      else
+        Dimensions.new(0, 0)
+      end
     end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_tab_helper.rb

@@ -22,16 +22,17 @@ module OnlyofficeWebdriverWrapper
     end
 
     # Switch to popup window
+    # @param popup_appear_timeout [Integer] how much time to wait for popup window
     # @param after_switch_timeout [Integer] wait after switch to window
     # non-zero to workaround bug with page load hanging up after switch
     # @return [void]
-    def switch_to_popup(after_switch_timeout: 3)
+    def switch_to_popup(after_switch_timeout: 3, popup_appear_timeout: 30)
       counter = 0
-      while tab_count < 2 && counter < 30
+      while tab_count < 2 && counter < popup_appear_timeout
         sleep 1
         counter += 1
       end
-      webdriver_error('switch_to_popup: Popup window not found') if counter >= 30
+      webdriver_error('switch_to_popup: Popup window not found') if counter >= popup_appear_timeout
       list_of_handlers = @driver.window_handles
       last_window_handler = list_of_handlers.last
       @driver.switch_to.window(last_window_handler)

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -168,7 +168,8 @@ module OnlyofficeWebdriverWrapper
         set_style_attribute("#{xpath_name}/button", 'display', 'inline-block')
         set_style_attribute(xpath_name, 'display', 'block')
       else
-        @driver.action.move_to(element, horizontal_shift, vertical_shift).click.perform
+        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
       end
     end
 
@@ -182,7 +183,10 @@ module OnlyofficeWebdriverWrapper
     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)
-      (0...times).inject(@driver.action.move_to(element, right_by.to_i, down_by.to_i)) { |acc, _elem| acc.send(action) }.perform
+      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
     end
 
     # Check if element present on page
@@ -254,7 +258,8 @@ module OnlyofficeWebdriverWrapper
 
         begin
           visible = element.displayed?
-        rescue Exception
+        rescue Exception => e
+          OnlyofficeLoggerHelper.log("Element #{xpath_name} is not visible because of: #{e.message}")
           visible = false
         end
         visible
@@ -295,7 +300,7 @@ module OnlyofficeWebdriverWrapper
     # @param [String] xpath_several_elements to find objects
     # @return [Array<String>] text of those elements
     def get_text_of_several_elements(xpath_several_elements)
-      @driver.find_elements(:xpath, xpath_several_elements).map { |element| element.text unless element.text == '' }.compact
+      @driver.find_elements(:xpath, xpath_several_elements).filter_map { |element| element.text unless element.text == '' }
     end
 
     # Select value of combo box

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -275,14 +275,14 @@ files:
 - lib/onlyoffice_webdriver_wrapper/helpers/bin/geckodriver
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chrome_version_helper.rb
-- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_100
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_101
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_102
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_103
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_mac
 - lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper/save_to_disk_files.list
 - lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb
-- lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/headless_screenshot_patch.rb
+- lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/headless_patch.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/headless_video_recorder.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/real_display_tools.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/ruby_helper.rb
@@ -325,14 +325,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.16
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem