onlyoffice_webdriver_wrapper 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb66b9cb0b1d1d9c2c1b073c87c8448f219ab606167cf04fc07098fb1b9ab52c
-  data.tar.gz: dcc8a129fd4bb6c1bf03cb3c7512e02307b1c468a57692b0cccfaf367013a810
+  metadata.gz: 643b10c1d669416dbc430566e360d7ccec6ea147d42f37707a0534b734bc1d98
+  data.tar.gz: 0e8b63041f0e9db6a2415f9aaa9eb966866d6555479bfec7f93c983011b5500b
 SHA512:
-  metadata.gz: 9d291a4d9e4cb76071c29f99ff9e406aed808acadd2da20b8a4809da3104ec6787632a46049af95def7b6ea631a1a345f180e7313297089fc369d13ffa43eefe
-  data.tar.gz: 79450930ff1f94e966076dd0ad4c34ea8a88ca746b373dd6505dfc7f1f888b2cd8fb6deac3f2f96d46d763ead26d60dee27bddbe40e1a60540ff0cbc79f89052
+  metadata.gz: 117134c44e8598f311bf93bf457bbd4768b9eafbc6b97c8fc294c9b584143623a64473b733952b7539d5f0b1663a2da3b80d6c60f5866391a4e3870195e4326e
+  data.tar.gz: d9e14fc44a181d86a6a8c85e9b8c89f2d41c279ab19a8cd00c8d209dcd4df55c1bbf98fee9059de3506cdd704315eb64588e062853b8563df3a035e44e5a0e37

data/lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper.rb

@@ -21,7 +21,10 @@ module OnlyofficeWebdriverWrapper
       caps = Selenium::WebDriver::Remote::Capabilities.firefox
       caps[:proxy] = Selenium::WebDriver::Proxy.new(ssl: "#{@proxy.proxy_address}:#{@proxy.proxy_port}") if @proxy
       driver = Selenium::WebDriver.for :firefox, service: firefox_service, capabilities: [caps, options]
-      driver.manage.window.size = Selenium::WebDriver::Dimension.new(headless.resolution_x, headless.resolution_y) if headless.running?
+      if headless.running?
+        driver.manage.window.size = Selenium::WebDriver::Dimension.new(headless.resolution_x,
+                                                                       headless.resolution_y)
+      end
       driver
     end
 

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/headless_patch.rb

@@ -29,7 +29,7 @@ class Headless
   class VideoRecorder
     # Stop recording and save it
     # @param [String] path to save
-    # @retunr [nil, String] path to result file or nil if error
+    # @return [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

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb

@@ -54,7 +54,7 @@ module OnlyofficeWebdriverWrapper
                                           destroy_at_exit: true,
                                           dimensions: "#{@resolution_x + 1}x#{@resolution_y + 1}x24",
                                           video: { provider: :ffmpeg })
-      rescue Exception => e
+      rescue StandardError => e
         OnlyofficeLoggerHelper.log("xvfb not started with problem #{e}")
         WebDriver.clean_up(true)
         @headless_instance = Headless.new(reuse: false,

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.10.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb

@@ -24,8 +24,10 @@ module OnlyofficeWebdriverWrapper
         begin
           count.times { element.click }
         rescue Selenium::WebDriver::Error::ElementNotInteractableError => e
-          webdriver_error(e.class, "Selenium::WebDriver::Error::ElementNotInteractableError: element not visible for xpath: #{xpath_name}")
-        rescue Exception => e
+          webdriver_error(e.class,
+                          'Selenium::WebDriver::Error::ElementNotInteractableError: ' \
+                          "element not visible for xpath: #{xpath_name}")
+        rescue StandardError => e
           webdriver_error(e.class, "UnknownError #{e.message} #{xpath_name}")
         end
       end
@@ -38,7 +40,7 @@ module OnlyofficeWebdriverWrapper
       element = get_element_by_display(xpath_name)
       begin
         element.is_a?(Array) ? element.first.click : element.click
-      rescue Exception => e
+      rescue StandardError => e
         webdriver_error(e.class, "Exception #{e} in click_on_displayed(#{xpath_name})")
       end
     end
@@ -50,10 +52,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 +100,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 +119,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/element_getters.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Methods to get elements
+  module ClickMethods
+    # Get element by it's xpath
+    # @param [String] object_identification xpath of object to find
+    # @return [Object, nil] nil if nothing found
+    def get_element(object_identification)
+      return object_identification unless object_identification.is_a?(String)
+
+      @driver.find_element(:xpath, object_identification)
+    rescue StandardError
+      nil
+    end
+
+    # Get first visible element from several
+    # @param [String] xpath_name to find several objects
+    # @raise [Selenium::WebDriver::Error::InvalidSelectorError] if selector is invalid
+    # @return [Object] first visible element
+    def get_element_by_display(xpath_name)
+      @driver.find_elements(:xpath, xpath_name).each do |element|
+        return element if element.displayed?
+      end
+    rescue Selenium::WebDriver::Error::InvalidSelectorError
+      webdriver_error(Selenium::WebDriver::Error::InvalidSelectorError,
+                      "Invalid Selector: get_element_by_display('#{xpath_name}')")
+    end
+
+    # Get array of webdriver object by xpath
+    # @param [String] objects_identification object to find
+    # @param [Boolean] only_visible return invisible if true
+    # @return [Array, Object] list of objects
+    def get_elements(objects_identification, only_visible = true)
+      return objects_identification if objects_identification.is_a?(Array)
+
+      elements = @driver.find_elements(:xpath, objects_identification)
+      if only_visible
+        elements.each do |current|
+          elements.delete(current) unless @browser == :firefox || current.displayed?
+        end
+      end
+      elements
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/get_text_methods.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Method to get text
+  module GetTextMethods
+    # Get text of current element
+    # @param [String] xpath_name name of xpath
+    # @param [Boolean] wait_until_visible wait until element visible
+    # @return [String] result string
+    def get_text(xpath_name, wait_until_visible = true)
+      wait_until_element_visible(xpath_name) if wait_until_visible
+
+      element = get_element(xpath_name)
+      webdriver_error("get_text(#{xpath_name}, #{wait_until_visible}) not found element by xpath") if element.nil?
+      if element.tag_name == 'input' || element.tag_name == 'textarea'
+        element.attribute('value')
+      else
+        element.text
+      end
+    end
+
+    # Get text in object by xpath
+    # @param xpath [String] xpath to get text
+    # @return [String] text in xpath
+    def get_text_by_js(xpath)
+      text = execute_javascript("return #{dom_element_by_xpath(xpath)}.textContent")
+      text = execute_javascript("return #{dom_element_by_xpath(xpath)}.value") if text.empty?
+      text
+    end
+
+    # Get text from all elements with specified xpath
+    # @param array_elements [String] xpath of elements
+    # @return [Array<String>] values of elements
+    def get_text_array(array_elements)
+      get_elements(array_elements).map { |current_element| get_text(current_element) }
+    end
+
+    # Get text from several elements
+    # This method filter out all elements with empty text
+    # @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).filter_map do |element|
+        element.text unless element.text == ''
+      end
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/select_list_methods.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Method to work with select list
+  module SelectListMethods
+    # Select from list elements
+    # @param [String] value value to find object
+    # @param [Array<PageObject::Elements::Element>] elements_value `elements` page object to select from
+    # @raise [SelectEntryNotFound] if value not found in select list
+    # @return [void]
+    def select_from_list_elements(value, elements_value)
+      index = get_element_index(value, elements_value)
+      webdriver_error(SelectEntryNotFound, "Select entry `#{value}` not found in #{elements_value}") if index.nil?
+
+      elements_value[index].click
+    end
+
+    # Get index of element by it's text
+    # @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) == text
+      end
+      nil
+    end
+
+    # Get all options for combobox or select
+    # @param [String] xpath_name to find element
+    # @return [Array<String>] values
+    def get_all_combo_box_values(xpath_name)
+      @driver.find_element(:xpath, xpath_name).find_elements(tag_name: 'option').map { |el| el.attribute('value') }
+    end
+
+    # Select value of combo box
+    # @param [String] xpath_name to find combobox
+    # @param [String] select_value to select
+    # @param [Symbol] select_by select type, can be `:value` or `:text`
+    # @return [void]
+    def select_combo_box(xpath_name, select_value, select_by = :value)
+      wait_until_element_visible(xpath_name)
+      option = Selenium::WebDriver::Support::Select.new(get_element(xpath_name))
+      begin
+        option.select_by(select_by, select_value)
+      rescue StandardError
+        option.select_by(:text, select_value)
+      end
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb

@@ -12,7 +12,7 @@ module OnlyofficeWebdriverWrapper
       begin
         attribute_value = element.attribute(attribute)
         exist = !(attribute_value.empty? || attribute_value.nil?)
-      rescue Exception
+      rescue StandardError
         exist = false
       end
       exist

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_exceptions.rb

@@ -3,4 +3,6 @@
 module OnlyofficeWebdriverWrapper
   # Exception class if system is not supported
   class WebdriverSystemNotSupported < StandardError; end
+  # If entry needed to be selected not found in select
+  class SelectEntryNotFound < StandardError; end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_frame_methods.rb

@@ -13,7 +13,7 @@ module OnlyofficeWebdriverWrapper
         @driver.switch_to.frame frame
       rescue Selenium::WebDriver::Error::NoSuchElementError
         OnlyofficeLoggerHelper.log('Raise NoSuchElementError in the select_frame method')
-      rescue Exception => e
+      rescue StandardError => e
         webdriver_error("Raise unknown exception: #{e}")
       end
     end
@@ -24,7 +24,7 @@ module OnlyofficeWebdriverWrapper
       @driver.switch_to.default_content
     rescue Timeout::Error
       OnlyofficeLoggerHelper.log('Raise TimeoutError in the select_top_frame method')
-    rescue Exception => e
+    rescue StandardError => e
       raise "Browser is crushed or hangup with error: #{e}"
     end
   end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_js_methods.rb

@@ -18,7 +18,7 @@ module OnlyofficeWebdriverWrapper
       # in that case performing `webdriver_error` only cause forever loop
       # since webdriver_error trying to get_url or make screenshots
       raise(e.class, "Timeout Error #{e} happened while executing #{script}")
-    rescue Exception => e
+    rescue StandardError => e
       webdriver_error(e, "Exception #{e} in execute_javascript: #{script}")
     end
 
@@ -40,15 +40,6 @@ module OnlyofficeWebdriverWrapper
       execute_javascript("#{dom_element_by_xpath(xpath)}.value=\"#{escaped_text}\";")
     end
 
-    # Get text in object by xpath
-    # @param xpath [String] xpath to get text
-    # @return [String] text in xpath
-    def get_text_by_js(xpath)
-      text = execute_javascript("return #{dom_element_by_xpath(xpath)}.textContent")
-      text = execute_javascript("return #{dom_element_by_xpath(xpath)}.value") if text.empty?
-      text
-    end
-
     # Calculate object size using Javascript
     # @param xpath [Sting] xpath of object
     # @return [Dimensions] size of element
@@ -93,7 +84,7 @@ module OnlyofficeWebdriverWrapper
     # @param property [String] property to get
     # @return [String] value of property
     def computed_style(xpath, pseudo_element = 'null', property = nil)
-      element_by_xpath = "document.evaluate(\"#{xpath.tr('"', "'")}\",document, null, XPathResult.ANY_TYPE, null ).iterateNext()"
+      element_by_xpath = dom_element_by_xpath(xpath)
       style = "window.getComputedStyle(#{element_by_xpath}, '#{pseudo_element}')"
       full_command = "#{style}.getPropertyValue('#{property}')"
       result = execute_javascript("return #{full_command}")

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

@@ -20,12 +20,16 @@ module OnlyofficeWebdriverWrapper
 
     # @return [String] url of current frame, or browser url if
     #   it is a root frame
-    def get_url
+    def current_url
       execute_javascript('return window.location.href')
     rescue Selenium::WebDriver::Error::NoSuchFrameError, Timeout::Error => e
       raise(e.class, "Browser is crushed or hangup with #{e}")
     end
 
+    alias get_url current_url
+    extend Gem::Deprecate
+    deprecate :get_url, 'current_url', 2069, 1
+
     # Refresh current page
     # @return [nil]
     def refresh
@@ -48,11 +52,11 @@ module OnlyofficeWebdriverWrapper
       begin
         @driver.execute_script('window.onbeforeunload = null') # off popup window
       rescue StandardError
-        Exception
+        StandardError
       end
       begin
         @driver.quit
-      rescue Exception => e
+      rescue StandardError => e
         OnlyofficeLoggerHelper.log("Some error happened on webdriver.quit #{e.backtrace}")
       end
       alert_confirm

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_screenshot_helper.rb

@@ -22,7 +22,8 @@ module OnlyofficeWebdriverWrapper
     # Get screenshot of current windows and upload it to cloud storage
     # @param [String] path_to_screenshot place to store local screenshot
     # @return [String] url of public screenshot
-    def get_screenshot_and_upload(path_to_screenshot = "#{screenshot_folder}/#{StringHelper.generate_random_string}.png")
+    def get_screenshot_and_upload(path_to_screenshot = nil)
+      path_to_screenshot ||= "#{screenshot_folder}/#{StringHelper.generate_random_string}.png"
       begin
         get_screenshot(path_to_screenshot)
         cloud_screenshot = publish_screenshot(path_to_screenshot)
@@ -57,20 +58,20 @@ module OnlyofficeWebdriverWrapper
     def webdriver_screenshot(screenshot_name = SecureRandom.uuid)
       begin
         link = get_screenshot_and_upload("#{screenshot_folder}/#{screenshot_name}.png")
-      rescue Exception => e
+      rescue StandardError => e
         OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. Trying to get headless screenshot")
         if @headless.headless_instance.nil?
           system_screenshot("/tmp/#{screenshot_name}.png")
           begin
             link = publish_screenshot("/tmp/#{screenshot_name}.png")
-          rescue Exception => e
+          rescue StandardError => e
             OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. System screenshot #{link}")
           end
         else
           @headless.take_screenshot("/tmp/#{screenshot_name}.png")
           begin
             link = publish_screenshot("/tmp/#{screenshot_name}.png")
-          rescue Exception => e
+          rescue StandardError => e
             OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. Headless screenshot #{link}")
           end
         end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_tab_helper.rb

@@ -85,8 +85,13 @@ module OnlyofficeWebdriverWrapper
     end
 
     # @return [String] title of current tab
-    def get_title_of_current_tab
+    def title_of_current_tab
       @driver.title
     end
+
+    alias get_title_of_current_tab title_of_current_tab
+
+    extend Gem::Deprecate
+    deprecate :get_title_of_current_tab, 'title_of_current_tab', 2069, 1
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_type_helper.rb

@@ -32,12 +32,17 @@ module OnlyofficeWebdriverWrapper
     # @param [Boolean] by_action type by `@driver.action` if true
     # @param [Boolean] by_element_send_key use `element.send_keys` if true
     # @return [void]
-    def type_to_locator(xpath_name, text_to_send, clear_content = true, click_on_it = false, by_action = false, by_element_send_key = false)
+    def type_to_locator(xpath_name,
+                        text_to_send,
+                        clear_content = true,
+                        click_on_it = false,
+                        by_action = false,
+                        by_element_send_key = false)
       element = get_element(xpath_name)
       if clear_content
         begin
           element.clear
-        rescue Exception => e
+        rescue StandardError => e
           webdriver_error(e.class, "Error in element.clear #{e} for " \
                                    "type_to_locator(#{xpath_name}, #{text_to_send}, " \
                                    "#{clear_content}, #{click_on_it}, " \
@@ -81,8 +86,11 @@ module OnlyofficeWebdriverWrapper
       if click_on_it
         begin
           element.click
-        rescue Exception => e
-          webdriver_error(e.class, "type_to_input(#{xpath_name}, #{text_to_send}, #{clear_content}, #{click_on_it}) error in 'element.click' error: #{e}")
+        rescue StandardError => e
+          webdriver_error(e.class,
+                          "type_to_input(#{xpath_name}, #{text_to_send}, " \
+                          "#{clear_content}, #{click_on_it}) " \
+                          "error in 'element.click' error: #{e}")
         end
         sleep 0.2
       end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -8,6 +8,9 @@ require 'uri'
 require_relative 'helpers/chrome_helper'
 require_relative 'helpers/firefox_helper'
 require_relative 'webdriver/click_methods'
+require_relative 'webdriver/element_getters'
+require_relative 'webdriver/get_text_methods'
+require_relative 'webdriver/select_list_methods'
 require_relative 'webdriver/wait_until_methods'
 require_relative 'webdriver/webdriver_alert_helper'
 require_relative 'webdriver/webdriver_attributes_helper'
@@ -31,6 +34,8 @@ module OnlyofficeWebdriverWrapper
   class WebDriver
     include ChromeHelper
     include ClickMethods
+    include GetTextMethods
+    include SelectListMethods
     include FirefoxHelper
     include RubyHelper
     include WaitUntilMethods
@@ -91,68 +96,12 @@ module OnlyofficeWebdriverWrapper
       @browser_running = true
     end
 
-    # Get element by it's xpath
-    # @param [String] object_identification xpath of object to find
-    # @return [Object, nil] nil if nothing found
-    def get_element(object_identification)
-      return object_identification unless object_identification.is_a?(String)
-
-      @driver.find_element(:xpath, object_identification)
-    rescue StandardError
-      nil
-    end
-
-    # Get text from all elements with specified xpath
-    # @param array_elements [String] xpath of elements
-    # @return [Array<String>] values of elements
-    def get_text_array(array_elements)
-      get_elements(array_elements).map { |current_element| get_text(current_element) }
-    end
-
-    # Select from list elements
-    # @param [String] value value to find object
-    # @param [Array<Object>] elements_value elements to check
-    # @return [void]
-    def select_from_list_elements(value, elements_value)
-      index = get_element_index(value, elements_value)
-      elements_value[index].click
-    end
-
-    # Get index of element by it's text
-    # @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) == text
-      end
-      nil
-    end
-
-    # Get all options for combo box
-    # @param [String] xpath_name to find combobox
-    # @return [Array<String>] values
-    def get_all_combo_box_values(xpath_name)
-      @driver.find_element(:xpath, xpath_name).find_elements(tag_name: 'option').map { |el| el.attribute('value') }
-    end
-
-    # Scroll list to specific element
-    # @param [String] list_xpath how to find this list
-    # @param [String] element_xpath to which we should scrolled
-    # @return [void]
-    def scroll_list_to_element(list_xpath, element_xpath)
-      execute_javascript("$(document.evaluate(\"#{list_xpath}\", document, null, XPathResult.ANY_TYPE, null).
-          iterateNext()).jScrollPane().data('jsp').scrollToElement(document.evaluate(\"#{element_xpath}\",
-          document, null, XPathResult.ANY_TYPE, null).iterateNext());")
-    end
-
     # Scroll list by pixel count
     # @param [String] list_xpath how to detect this list
     # @param [Integer] pixels how much to scroll
     # @return [void]
     def scroll_list_by_pixels(list_xpath, pixels)
-      execute_javascript("$(document.evaluate(\"#{list_xpath.tr('"', "'")}\", document, null, XPathResult.ANY_TYPE, null).iterateNext()).scrollTop(#{pixels})")
+      execute_javascript("#{dom_element_by_xpath(list_xpath)}.scrollTop(#{pixels})")
     end
 
     # Open dropdown selector, like 'Color Selector', which has no element id
@@ -169,8 +118,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 +131,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)
@@ -203,21 +148,10 @@ module OnlyofficeWebdriverWrapper
         @driver.find_element(:xpath, xpath_name)
         true
       end
-    rescue Exception
+    rescue StandardError
       false
     end
 
-    # Get first visible element from several
-    # @param [String] xpath_name to find several objects
-    # @return [Object] first visible element
-    def get_element_by_display(xpath_name)
-      @driver.find_elements(:xpath, xpath_name).each do |element|
-        return element if element.displayed?
-      end
-    rescue Selenium::WebDriver::Error::InvalidSelectorError
-      webdriver_error("get_element_by_display(#{xpath_name}): invalid selector: Unable to locate an element with the xpath expression")
-    end
-
     # Return count of elements (visible and not visible)
     # @param xpath_name [String] xpath to find
     # @param only_visible [True, False] count only visible elements?
@@ -231,23 +165,8 @@ module OnlyofficeWebdriverWrapper
       end
     end
 
-    # Get array of webdriver object by xpath
-    # @param [String] objects_identification object to find
-    # @param [Boolean] only_visible return invisible if true
-    # @return [Array, Object] list of objects
-    def get_elements(objects_identification, only_visible = true)
-      return objects_identification if objects_identification.is_a?(Array)
-
-      elements = @driver.find_elements(:xpath, objects_identification)
-      if only_visible
-        elements.each do |current|
-          elements.delete(current) unless @browser == :firefox || current.displayed?
-        end
-      end
-      elements
-    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)
@@ -259,7 +178,7 @@ module OnlyofficeWebdriverWrapper
 
         begin
           visible = element.displayed?
-        rescue Exception => e
+        rescue StandardError => e
           OnlyofficeLoggerHelper.log("Element #{xpath_name} is not visible because of: #{e.message}")
           visible = false
         end
@@ -277,54 +196,21 @@ module OnlyofficeWebdriverWrapper
         return true if current_element.displayed?
       end
       false
-    rescue Exception => e
+    rescue StandardError => e
       webdriver_error("Raise unknown exception: #{e}")
     end
 
-    # Get text of current element
-    # @param [String] xpath_name name of xpath
-    # @param [Boolean] wait_until_visible wait until element visible
-    # @return [String] result string
-    def get_text(xpath_name, wait_until_visible = true)
-      wait_until_element_visible(xpath_name) if wait_until_visible
-
-      element = get_element(xpath_name)
-      webdriver_error("get_text(#{xpath_name}, #{wait_until_visible}) not found element by xpath") if element.nil?
-      if element.tag_name == 'input' || element.tag_name == 'textarea'
-        element.attribute('value')
-      else
-        element.text
-      end
-    end
-
-    # Get text from several elements
-    # @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).filter_map { |element| element.text unless element.text == '' }
-    end
-
-    # Select value of combo box
-    # @param [String] xpath_name to find combobox
-    # @param [String] select_value to select
-    # @param [Symbol] select_by select type
-    # @return [void]
-    def select_combo_box(xpath_name, select_value, select_by = :value)
-      wait_until_element_visible(xpath_name)
-      option = Selenium::WebDriver::Support::Select.new(get_element(xpath_name))
-      begin
-        option.select_by(select_by, select_value)
-      rescue StandardError
-        option.select_by(:text, select_value)
-      end
-    end
-
     # Get page source
     # @return [String] all page source
-    def get_page_source
+    def page_source
       @driver.execute_script('return document.documentElement.innerHTML;')
     end
 
+    alias get_page_source page_source
+
+    extend Gem::Deprecate
+    deprecate :get_page_source, 'page_source', 2069, 1
+
     # Raise an error, making a screenshot before it
     # @param [String, Object] exception class to raise
     # @param [String] error_message to raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.0
 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-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -31,16 +31,16 @@ dependencies:
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: onlyoffice_logger_helper
   requirement: !ruby/object:Gem::Requirement
@@ -59,9 +59,9 @@ dependencies:
   name: onlyoffice_s3_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -69,9 +69,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -275,9 +275,9 @@ 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_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_linux_104
 - 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
@@ -291,6 +291,9 @@ files:
 - lib/onlyoffice_webdriver_wrapper/version.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb
+- lib/onlyoffice_webdriver_wrapper/webdriver/element_getters.rb
+- lib/onlyoffice_webdriver_wrapper/webdriver/get_text_methods.rb
+- lib/onlyoffice_webdriver_wrapper/webdriver/select_list_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/wait_until_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_alert_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb
@@ -332,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.20
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem