onlyoffice_webdriver_wrapper 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdfe224abc7b1f2c7e69e8830ec5cc388d3b8fa165a969f8860a832e1ab51319
-  data.tar.gz: cf61e06fce72afbb30398cdd62693544107059701316698705da602231eb7d9a
+  metadata.gz: 72e6c203a606a12d451ab746ca13b41642f717c2e296446923849029fcb9d8a6
+  data.tar.gz: 7cefdc7a70b4119b95f62c8b6ac8ec264831de9e764b1d78104599d86eb62778
 SHA512:
-  metadata.gz: '061282552a87103e53e3d94f4ce3be7d8a811378ad6d64c1620089b7f259ce231c8d7de931d8a60c83a7b601c31f599b7ccf3e92a4d86ae22efae2f5d8f5b6c6'
-  data.tar.gz: 7d0d8e1528f07f2a8bca61a972acf872075870ffd2dba37b088e9969c4b2f8d9ed91baee62df2a2b732930a77c9e0b0760541b743496d333cdc464c61ce08d5e
+  metadata.gz: dda0bcec308916e29b9b17312e839096242b1fcd7a75cd1262e5dd8feff5b621268d777be6d4f2db543ccc7bfc65f09db6675e840a59fc6744d3388b8438ac88
+  data.tar.gz: af6d0cfeae8483462f7939bd258898aa0f6c196bc311528998c7f684a34f7fd715c01f7eae4438ed5569b95917cfa50e5b9d3bd3476bb6a65eb2ef9b2ab8e5ec

data/lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chrome_version_helper.rb

@@ -20,10 +20,12 @@ module OnlyofficeWebdriverWrapper
       @chrome_version = unknown_chrome_version
     end
 
+    # @param [Symbol] force_os force OS for chrome version (`:linux` or `:mac`),
+    #   if empty - will try to autodetect current os
     # @return [String] path to chromedriver
-    def chromedriver_path
-      return default_mac if OSHelper.mac?
-      return default_linux if chrome_version == unknown_chrome_version
+    def chromedriver_path(force_os = nil)
+      return default_mac if OSHelper.mac? || force_os == :mac
+      return default_linux if (chrome_version == unknown_chrome_version) || force_os == :linux
 
       chromedriver_path_cur_chrome
     end

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.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.9.0'
+    STRING = '1.11.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

data/lib/onlyoffice_webdriver_wrapper/webdriver/get_text_methods.rb

@@ -40,7 +40,9 @@ 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).filter_map { |element| element.text unless element.text == '' }
+      @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/wait_until_methods.rb

@@ -33,7 +33,7 @@ module OnlyofficeWebdriverWrapper
     # @param [String] xpath_name to find object
     # @param [Integer] timeout How much to wait
     # @raise [StandardError] error if element not found for timeout
-    # @return [void]
+    # @return [Boolean] true if element is visible after some timeout
     def wait_until_element_visible(xpath_name, timeout = 15)
       wait_until_element_present(xpath_name)
       time = 0
@@ -41,24 +41,9 @@ module OnlyofficeWebdriverWrapper
         sleep(1)
         time += 1
       end
-      return unless time >= timeout
-
-      webdriver_error("Element #{xpath_name} not visible for #{timeout} seconds")
-    end
+      return true unless time >= timeout
 
-    # Wait until element present and visible
-    # @param [String] xpath_name xpath of element
-    # @param [Integer] period_of_wait how much time sleep each iteration of wait
-    # @param [Integer] critical_time maximum time for wait for element
-    # @return [nil]
-    def wait_element(xpath_name, period_of_wait = 1, critical_time = 3)
-      wait_until_element_present(xpath_name)
-      time = 0
-      until element_visible?(xpath_name)
-        sleep(period_of_wait)
-        time += 1
-        return if time == critical_time
-      end
+      webdriver_error("Element `#{xpath_name}` not visible for #{timeout} seconds")
     end
 
     # Wait until some element present

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_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

@@ -16,9 +16,9 @@ module OnlyofficeWebdriverWrapper
       # Usually this mean browser hang up or some modular
       # window is blocking browser for execution of any code
       # in that case performing `webdriver_error` only cause forever loop
-      # since webdriver_error trying to get_url or make screenshots
+      # since webdriver_error trying to current_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
 
@@ -84,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_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

@@ -30,7 +30,7 @@ require_relative 'webdriver/webdriver_browser_log_helper'
 
 # Namespace of this gem
 module OnlyofficeWebdriverWrapper
-  # noinspection RubyTooManyMethodsInspection, RubyInstanceMethodNamingConvention, RubyParameterNamingConvention
+  # Class for working with webdriver, main class of project
   class WebDriver
     include ChromeHelper
     include ClickMethods
@@ -101,7 +101,7 @@ module OnlyofficeWebdriverWrapper
     # @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
@@ -110,16 +110,7 @@ module OnlyofficeWebdriverWrapper
     # @param [Integer] vertical_shift y value
     # @return [void]
     def open_dropdown_selector(xpath_name, horizontal_shift = 30, vertical_shift = 0)
-      element = get_element(xpath_name)
-      if @browser == :firefox || @browser == :safari
-        set_style_attribute("#{xpath_name}/button", 'display', 'none')
-        set_style_attribute(xpath_name, 'display', 'inline')
-        element.click
-        set_style_attribute("#{xpath_name}/button", 'display', 'inline-block')
-        set_style_attribute(xpath_name, 'display', 'block')
-      else
-        move_to_driver_action(xpath_name, horizontal_shift, vertical_shift).click.perform
-      end
+      move_to_driver_action(xpath_name, horizontal_shift, vertical_shift).click.perform
     end
 
     # Perform an action on coordinate
@@ -148,7 +139,7 @@ module OnlyofficeWebdriverWrapper
         @driver.find_element(:xpath, xpath_name)
         true
       end
-    rescue Exception
+    rescue StandardError
       false
     end
 
@@ -178,7 +169,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
@@ -196,16 +187,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 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
@@ -217,7 +213,6 @@ module OnlyofficeWebdriverWrapper
         exception = RuntimeError
       end
       select_top_frame
-      current_url = get_url
       raise exception, "#{error_message}\n\nPage address: #{current_url}\n\nError #{webdriver_screenshot}"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-31 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_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_linux_105
 - 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
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem