onlyoffice_webdriver_wrapper 1.5.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5df788a81c667db36170734c846265c9d4681b99164fabdbf29f230fcc88d2
-  data.tar.gz: 39b5e2613199b10aa7952c2c8916ba6e5dd2e0cf48b711081f9cf5c0569207a7
+  metadata.gz: bb66b9cb0b1d1d9c2c1b073c87c8448f219ab606167cf04fc07098fb1b9ab52c
+  data.tar.gz: dcc8a129fd4bb6c1bf03cb3c7512e02307b1c468a57692b0cccfaf367013a810
 SHA512:
-  metadata.gz: 650323085c52076064a0bf611f0c1f81d8381417216b3447a625830c6d194195622eb08baa180034be19696bd5305779ac30ed7bbd90a859b76b0b787f426406
-  data.tar.gz: 7a386086ed9a650e9e3f735d8bb8d126d9a9d5212694151643e435be8d1ef5c795021cca1c355260167c5341c6ee99d16537cc5941256b47618a6c45f97a92fd
+  metadata.gz: 9d291a4d9e4cb76071c29f99ff9e406aed808acadd2da20b8a4809da3104ec6787632a46049af95def7b6ea631a1a345f180e7313297089fc369d13ffa43eefe
+  data.tar.gz: 79450930ff1f94e966076dd0ad4c34ea8a88ca746b373dd6505dfc7f1f888b2cd8fb6deac3f2f96d46d763ead26d60dee27bddbe40e1a60540ff0cbc79f89052

data/lib/onlyoffice_webdriver_wrapper/dimensions.rb

@@ -10,6 +10,15 @@ module OnlyofficeWebdriverWrapper
       @top = top
     end
 
+    # Compare two dimensions object
+    # @param [Object] other object
+    # @return [Boolean] result of comparison
+    def ==(other)
+      return false unless other.respond_to?(:left) && other.respond_to?(:top)
+
+      @left == other.left && @top == other.top
+    end
+
     alias width left
     alias height top
     alias x left
@@ -19,5 +28,10 @@ module OnlyofficeWebdriverWrapper
     def to_s
       "Dimensions(left: #{@left}, top: #{@top})"
     end
+
+    # @return [Dimensions] Center point of current dimension
+    def center
+      Dimensions.new(@left / 2, @top / 2)
+    end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper.rb

@@ -29,7 +29,7 @@ module OnlyofficeWebdriverWrapper
 
     # @return [Array<String>] list of formats to save
     def read_firefox_files_to_save
-      path_to_file = "#{Dir.pwd}/lib/onlyoffice_webdriver_wrapper/"\
+      path_to_file = "#{Dir.pwd}/lib/onlyoffice_webdriver_wrapper/" \
                      'helpers/firefox_helper/save_to_disk_files.list'
       OnlyofficeFileHelper::FileHelper.read_array_from_file(path_to_file)
                                       .join(', ')

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.5.0'
+    STRING = '1.8.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/wait_until_methods.rb

@@ -71,8 +71,8 @@ module OnlyofficeWebdriverWrapper
       begin
         wait.until { get_element(xpath_name) }
       rescue Selenium::WebDriver::Error::TimeoutError => e
-        timeout_message = "wait_until_element_present(#{xpath_name}) "\
-                          'Selenium::WebDriver::Error::TimeoutError: '\
+        timeout_message = "wait_until_element_present(#{xpath_name}) " \
+                          'Selenium::WebDriver::Error::TimeoutError: ' \
                           "timed out after #{timeout} seconds"
         webdriver_error(e.class, timeout_message)
       end
@@ -88,8 +88,8 @@ module OnlyofficeWebdriverWrapper
       begin
         wait.until { get_element(xpath_name) ? false : true }
       rescue Selenium::WebDriver::Error::TimeoutError => e
-        timeout_message = "wait_until_element_present(#{xpath_name}) "\
-                          'Selenium::WebDriver::Error::TimeoutError: '\
+        timeout_message = "wait_until_element_present(#{xpath_name}) " \
+                          'Selenium::WebDriver::Error::TimeoutError: ' \
                           "timed out after #{timeout} seconds"
         webdriver_error(e.class, timeout_message)
       end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_helper.rb

@@ -33,7 +33,7 @@ module OnlyofficeWebdriverWrapper
       if @download_directory.start_with?(Dir.tmpdir)
         FileUtils.remove_dir(@download_directory)
       else
-        OnlyofficeLoggerHelper.log("Download directory #{@download_directory} is not at tmp dir. "\
+        OnlyofficeLoggerHelper.log("Download directory #{@download_directory} is not at tmp dir. " \
                                    'It will be not deleted')
       end
     end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_js_methods.rb

@@ -30,12 +30,14 @@ module OnlyofficeWebdriverWrapper
     end
 
     # Type to locator by javascript
-    # @param [String] xpath_name to find object where to type
+    # @param [String] xpath to find object where to type
     # @param [String] text to type
     # @return [void]
-    def type_to_locator_by_javascript(xpath_name, text)
-      escaped_text = text.gsub('\\', '\\\\\\\\').gsub('"', '\\"').gsub("\n", '\\n')
-      execute_javascript("document.evaluate('#{xpath_name}', document, null, XPathResult.ANY_TYPE, null).iterateNext().value=\"#{escaped_text}\";")
+    def type_to_locator_by_javascript(xpath, text)
+      escaped_text = text.gsub('\\', '\\\\\\\\')
+                         .gsub('"', '\\"')
+                         .gsub("\n", '\\n')
+      execute_javascript("#{dom_element_by_xpath(xpath)}.value=\"#{escaped_text}\";")
     end
 
     # Get text in object by xpath
@@ -102,8 +104,8 @@ module OnlyofficeWebdriverWrapper
     # @param [String] xpath of element to remove
     # @return [String] result of javascript execution
     def remove_element(xpath)
-      script = "element = #{dom_element_by_xpath(xpath)};"\
-               'if (element !== null) '\
+      script = "element = #{dom_element_by_xpath(xpath)};" \
+               'if (element !== null) ' \
                '{element.parentNode.removeChild(element);};'
       execute_javascript(script)
     end

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_screenshot_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'fileutils'
 require 'onlyoffice_s3_wrapper'
 module OnlyofficeWebdriverWrapper
   # Working with screenshots
@@ -25,7 +26,7 @@ module OnlyofficeWebdriverWrapper
       begin
         get_screenshot(path_to_screenshot)
         cloud_screenshot = publish_screenshot(path_to_screenshot)
-        File.delete(path_to_screenshot) if File.exist?(path_to_screenshot)
+        FileUtils.rm_rf(path_to_screenshot)
         OnlyofficeLoggerHelper.log("upload screenshot: #{cloud_screenshot}")
         return cloud_screenshot
       rescue Errno::ENOENT => e

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/webdriver_type_helper.rb

@@ -38,9 +38,9 @@ module OnlyofficeWebdriverWrapper
         begin
           element.clear
         rescue Exception => e
-          webdriver_error(e.class, "Error in element.clear #{e} for "\
-                                   "type_to_locator(#{xpath_name}, #{text_to_send}, "\
-                                   "#{clear_content}, #{click_on_it}, "\
+          webdriver_error(e.class, "Error in element.clear #{e} for " \
+                                   "type_to_locator(#{xpath_name}, #{text_to_send}, " \
+                                   "#{clear_content}, #{click_on_it}, " \
                                    "#{by_action}, #{by_element_send_key})")
         end
       end
@@ -73,7 +73,7 @@ module OnlyofficeWebdriverWrapper
       element = get_element(xpath_name)
       if element.nil?
         webdriver_error(Selenium::WebDriver::Error::NoSuchElementError,
-                        "type_to_input(#{xpath_name}, #{text_to_send}, "\
+                        "type_to_input(#{xpath_name}, #{text_to_send}, " \
                         "#{clear_content}, #{click_on_it}): element not found")
       end
       element.clear if clear_content

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_user_agent_helper.rb

@@ -4,20 +4,20 @@ module OnlyofficeWebdriverWrapper
   # Module for working with webdriver useragent
   module WebdriverUserAgentHelper
     # @return [String] useragent for Android phone browser
-    USERAGENT_ANDROID_PHONE = 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MDB08M) '\
-                              'AppleWebKit/537.36 (KHTML, like Gecko) '\
+    USERAGENT_ANDROID_PHONE = 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MDB08M) ' \
+                              'AppleWebKit/537.36 (KHTML, like Gecko) ' \
                               'Chrome/51.0.2704.81 Mobile Safari/537.36'
     # @return [String] useragent for iPhone browser
-    USERAGENT_IPHONE = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X) '\
-                       'AppleWebKit/601.1.46 (KHTML, like Gecko) '\
+    USERAGENT_IPHONE = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X) ' \
+                       'AppleWebKit/601.1.46 (KHTML, like Gecko) ' \
                        'Version/9.0 Mobile/13F69 Safari/601.1'
     # @return [String] useragent for iPad Air 2 Safari browser
-    USERAGENT_IPAD_AIR_2_SAFARI = 'Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) '\
-                                  'AppleWebKit/602.1.50 (KHTML, like Gecko) '\
+    USERAGENT_IPAD_AIR_2_SAFARI = 'Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) ' \
+                                  'AppleWebKit/602.1.50 (KHTML, like Gecko) ' \
                                   'Version/10.0 Mobile/14A5346a Safari/602.1'
     # @return [String] useragent for Nexus 10 Chrome browser
-    USERAGENT_NEXUS_10_CHROME = 'Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) '\
-                                'AppleWebKit/537.36 (KHTML, like Gecko) '\
+    USERAGENT_NEXUS_10_CHROME = 'Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) ' \
+                                'AppleWebKit/537.36 (KHTML, like Gecko) ' \
                                 'Chrome/48.0.2564.23 Safari/537.36'
 
     # @return [String, nil] user agent string for current device

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -119,12 +119,13 @@ module OnlyofficeWebdriverWrapper
     end
 
     # Get index of element by it's text
-    # @param [String] title to compare text
-    # @param [Array<Objects>] list_elements to find in which
-    # @return [Object, nil] nil if nothing found
-    def get_element_index(title, list_elements)
+    # @param [String] text to compare text
+    # @param [Array<PageObject::Elements::Element>] list_elements array with
+    #   PageObject elements to find in
+    # @return [Integer, nil] nil if nothing found, index if found
+    def get_element_index(text, list_elements)
       list_elements.each_with_index do |current, i|
-        return i if get_text(current) == title
+        return i if get_text(current) == text
       end
       nil
     end
@@ -168,7 +169,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 +184,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 +259,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 +301,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.5.0
+  version: 1.8.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-07-07 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_98
+- 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.17
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem