onlyoffice_webdriver_wrapper 1.24.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a94ed0ce58d72ed1aeb6068d56b09ab71fb982616c64d556ed8cbbb1343227
-  data.tar.gz: 79706c16aad85d980b3eb5ae6ca5afddea8f2ea549b6ea221d61573d4e0205a7
+  metadata.gz: 0aceaacb5bf7e66061ddafda2df0e9d06e12a77ec871bb3bedbc9b96967b8d0a
+  data.tar.gz: c98dd310419eed1cbd358f0f856b6dd1cdfad64b2d2984564e6b4171165846d8
 SHA512:
-  metadata.gz: 511ff3a3bbf496bb9b0d3b3aff458891a2ef61f461b1416b947e46c60f3625dfd3fbb572d4474b39a18eff8bc17da4430cfc50a618e2e54d034b50c0d603c8c0
-  data.tar.gz: ad0ee6f6af4eb0dd472d550b70b04f94f731ea11f48d63559fdbd6f4b724edcbcf744d4ace173fe63c1ce64283dabf45f9675e1a88bd5dce46b20e24d3a2f6c8
+  metadata.gz: d83017ba4e1e435c85beceff3a4b9148782c63617f640e0b1474686fb143bb29a131824c0a7570461832081ea712963477d3025913941afa122904a1e87f809e
+  data.tar.gz: ce0b93eb08737ad701497762ec174947d052d39394d300352477f8f95b1dcc4b6e1a716136f41fd08d37e7aa22a5b79e498d5d42c2add58404c1bd4254481a20

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.24.0'
+    STRING = '1.26.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb

@@ -12,24 +12,30 @@ module OnlyofficeWebdriverWrapper
 
     # Click on locator
     # @param xpath_name [String] xpath to click
-    # @param by_javascript [True, False] should be clicked by javascript
+    # @param by_javascript [True, False] should be clicked by javascript or by webdriver action
     # @param count [Integer] count of clicks
-    def click_on_locator(xpath_name, by_javascript = false, count: 1)
+    # @param after_timeout [Integer] timeout after click
+    def click_on_locator(xpath_name, by_javascript = false, count: 1, after_timeout: 0)
       element = get_element(xpath_name)
       return webdriver_error("Element with xpath: #{xpath_name} not found") if element.nil?
 
-      if by_javascript
-        execute_javascript("#{dom_element_by_xpath(xpath_name)}.click();")
-      else
-        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 StandardError => e
-          webdriver_error(e.class, "UnknownError #{e.message} #{xpath_name}")
+      click_function = if by_javascript
+                         -> { execute_javascript("#{dom_element_by_xpath(xpath_name)}.click();") }
+                       else
+                         -> { element.click }
+                       end
+
+      begin
+        count.times do
+          click_function.call
+          sleep(after_timeout)
         end
+      rescue Selenium::WebDriver::Error::ElementNotInteractableError => 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
 

data/lib/onlyoffice_webdriver_wrapper/webdriver/element_getters.rb

@@ -22,7 +22,7 @@ module OnlyofficeWebdriverWrapper
       @driver.find_elements(:xpath, xpath_name).each do |element|
         return element if element.displayed?
       end
-    rescue Selenium::WebDriver::Error::InvalidSelectorError
+    rescue Selenium::WebDriver::Error::InvalidSelectorError, Selenium::WebDriver::Error::JavascriptError
       webdriver_error(Selenium::WebDriver::Error::InvalidSelectorError,
                       "Invalid Selector: get_element_by_display('#{xpath_name}')")
     end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_type_helper.rb

@@ -50,22 +50,16 @@ module OnlyofficeWebdriverWrapper
         end
       end
 
-      if click_on_it
-        click_on_locator(xpath_name)
-        sleep 0.2
-      end
+      click_on_locator(xpath_name, after_timeout: 0.2) if click_on_it
 
       if (@browser != :chrome && !by_action) || by_element_send_key
         element.send_keys text_to_send
-      elsif text_to_send != ''
-        if text_to_send.is_a?(String)
-          text_to_send.chars.each do |symbol|
-            @driver.action.send_keys(symbol).perform
-          end
-        else
-          webdriver_bug_8179_workaround(text_to_send)
-        end
+      else
+        send_text_by_chars(text_to_send)
       end
+    rescue Selenium::WebDriver::Error::JavascriptError
+      webdriver_error(Selenium::WebDriver::Error::InvalidElementStateError,
+                      "Invalid state of element: #{xpath_name}")
     end
 
     # Type text to input
@@ -171,5 +165,20 @@ module OnlyofficeWebdriverWrapper
         @driver.action.key_up(modifier).perform
       end
     end
+
+    # Send text by chars
+    # @param [String] text_to_send text to type
+    # @return [void]
+    def send_text_by_chars(text_to_send)
+      return if text_to_send == ''
+
+      if text_to_send.is_a?(String)
+        text_to_send.chars.each do |symbol|
+          @driver.action.send_keys(symbol).perform
+        end
+      else
+        webdriver_bug_8179_workaround(text_to_send)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.26.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -135,9 +135,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_120
-- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_121
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_122
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_123
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_124
 - 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
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem