onlyoffice_webdriver_wrapper 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7dd9754453bdfc98d527929ed558a8a8d7246b25e1ddd836b0af4a57ffc4d55
-  data.tar.gz: 49ca15eea9259e832423665aa0c7a86cc5d2afc17068c65fc6990c272a88091e
+  metadata.gz: 198918d5a397566f6099da61229da418520359f28a8eae58c554291303319ccb
+  data.tar.gz: a4f7e7764c1a49456b5eed0d8a851a20eb6a3fc38890b222c66540927b03fa11
 SHA512:
-  metadata.gz: c7dbe1f1368fb5a3f0b027ede5abc619e97dca747709066fe3fd0d3d7c5c2d89d01a7e45a0eb034652fe238fbb89959fe86deb7dd307ad28b24627381842eba5
-  data.tar.gz: aa67c58fe56ac730be39894b7aa316dc6e134938c89d13f0c46000d18008244f3d90d631ad0d50ae88a25e77c2808870dc470d7d61b582581376f65335c49a3b
+  metadata.gz: 6c7bbf7385332599f38140a7457db436d79ffb298ba63d0895d8582f8092049962b69b6b819ff27b2700e42d6a0ed272776714ef6fc4a4ddc523549e746cde17
+  data.tar.gz: 4776a813a596cbb702e4b1a9664ca22b92f65b5eeebe1523adc5ff29b012abee0a698451eab7802cc8c4933f85d8c808244ef29e487693f6d668a0260340cd34

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb

@@ -10,8 +10,11 @@ module OnlyofficeWebdriverWrapper
   class HeadlessHelper
     include RealDisplayTools
     include RubyHelper
+    # @return [Headless] instance of headless object
     attr_accessor :headless_instance
+    # @return [Integer] x resolution of virtual screen
     attr_accessor :resolution_x
+    # @return [Integer] y resolution of virtual screen
     attr_accessor :resolution_y
 
     def initialize(resolution_x = 1680, resolution_y = 1050)

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -2,6 +2,6 @@
 
 module OnlyofficeWebdriverWrapper
   module Version
-    STRING = '0.3.1'
+    STRING = '0.4.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -7,6 +7,8 @@ require 'selenium-webdriver'
 require 'uri'
 require_relative 'helpers/chrome_helper'
 require_relative 'helpers/firefox_helper'
+require_relative 'webdriver/click_methods'
+require_relative 'webdriver/wait_until_methods'
 require_relative 'webdriver/webdriver_alert_helper'
 require_relative 'webdriver/webdriver_attributes_helper'
 require_relative 'webdriver/webdriver_browser_info_helper'
@@ -24,8 +26,10 @@ module OnlyofficeWebdriverWrapper
   # noinspection RubyTooManyMethodsInspection, RubyInstanceMethodNamingConvention, RubyParameterNamingConvention
   class WebDriver
     include ChromeHelper
+    include ClickMethods
     include FirefoxHelper
     include RubyHelper
+    include WaitUntilMethods
     include WebdriverAlertHelper
     include WebdriverAttributesHelper
     include WebdriverBrowserInfo
@@ -37,17 +41,18 @@ module OnlyofficeWebdriverWrapper
     include WebdriverTabHelper
     include WebdriverUserAgentHelper
     include WebdriverBrowserLogHelper
-    TIMEOUT_WAIT_ELEMENT = 15
     TIMEOUT_FILE_DOWNLOAD = 100
     # @return [Array, String] default switches for chrome
     attr_accessor :driver
+    # @return [Symbol] browser to use
     attr_accessor :browser
     # @return [True, False] is browser currently running
     attr_reader :browser_running
     # @return [Symbol] device of which we try to simulate, default - :desktop_linux
     attr_accessor :device
+    # @return [String] directory to which file is downloaded
     attr_accessor :download_directory
-    attr_accessor :server_address
+    # @return [HeadlessHelper] headless wrapper
     attr_accessor :headless
     # @return [Net::HTTP::Proxy] connection proxy
     attr_accessor :proxy
@@ -123,20 +128,6 @@ module OnlyofficeWebdriverWrapper
       get_elements(array_elements).map { |current_element| get_text(current_element) }
     end
 
-    def click(element)
-      element.click
-    end
-
-    def click_and_wait(element_to_click, element_to_wait)
-      element_to_click.click
-      count = 0
-      while !element_to_wait.present? && count < 30
-        sleep 1
-        count += 1
-      end
-      webdriver_error("click_and_wait: Wait for element: #{element_to_click} for 30 seconds") if count == 30
-    end
-
     def select_from_list_elements(value, elements_value)
       index = get_element_index(value, elements_value)
       elements_value[index].click
@@ -171,27 +162,6 @@ module OnlyofficeWebdriverWrapper
       OnlyofficeLoggerHelper.log('Go back to previous page')
     end
 
-    def self.host_name_by_full_url(full_url)
-      uri = URI(full_url)
-      uri.port == 80 || uri.port == 443 ? "#{uri.scheme}://#{uri.host}" : "#{uri.scheme}://#{uri.host}:#{uri.port}"
-    end
-
-    def get_host_name
-      WebDriver.host_name_by_full_url(get_url)
-    end
-
-    def remove_event(event_name)
-      execute_javascript("jQuery(document).unbind('#{event_name}');")
-    end
-
-    def remove_class_by_jquery(selector, class_name)
-      execute_javascript("$(#{dom_element_by_xpath(selector)}).removeClass('#{class_name}');")
-    end
-
-    def add_class_by_jquery(selector, class_name)
-      execute_javascript("$(#{dom_element_by_xpath(selector)}).addClass('#{class_name}');")
-    end
-
     # Perform drag'n'drop action in one element (for example on big canvas area)
     # for drag'n'drop one whole element use 'drag_and_drop_by'
     # ==== Attributes
@@ -250,119 +220,12 @@ module OnlyofficeWebdriverWrapper
       end
     end
 
-    # Click on locator
-    # @param count [Integer] count of clicks
-    def click_on_locator(xpath_name, by_javascript = false, count: 1)
-      element = get_element(xpath_name)
-      return webdriver_error("Element with xpath: #{xpath_name} not found") if element.nil?
-
-      if by_javascript
-        execute_javascript("document.evaluate(\"#{xpath_name}\", document, null, XPathResult.ANY_TYPE, null).iterateNext().click();")
-      else
-        begin
-          count.times { element.click }
-        rescue Selenium::WebDriver::Error::ElementNotVisibleError
-          webdriver_error("Selenium::WebDriver::Error::ElementNotVisibleError: element not visible for xpath: #{xpath_name}")
-        rescue Exception => e
-          webdriver_error(e.class, "UnknownError #{e.message} #{xpath_name}")
-        end
-      end
-    end
-
-    def left_mouse_click(xpath, x_coord, y_coord)
-      @driver.action.move_to(get_element(xpath), x_coord.to_i, y_coord.to_i).click.perform
-    end
-
-    # Context click on locator
-    # @param [String] xpath_name name of xpath to click
-    def context_click_on_locator(xpath_name)
-      wait_until_element_visible(xpath_name)
-
-      element = @driver.find_element(:xpath, xpath_name)
-      @driver.action.context_click(element).perform
-    end
-
-    def right_click(xpath_name)
-      @driver.action.context_click(@driver.find_element(:xpath, xpath_name)).perform
-    end
-
-    def click_on_displayed(xpath_name)
-      element = get_element_by_display(xpath_name)
-      begin
-        element.is_a?(Array) ? element.first.click : element.click
-      rescue Exception => e
-        webdriver_error("Exception #{e} in click_on_displayed(#{xpath_name})")
-      end
-    end
-
-    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
-    end
-
-    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
-    end
-
-    def double_click(xpath_name)
-      wait_until_element_visible(xpath_name)
-      @driver.action.move_to(@driver.find_element(:xpath, xpath_name)).double_click.perform
-    end
-
-    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
-    end
-
     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
     end
 
-    def click_on_one_of_several_by_text(xpath_several_elements, text_to_click)
-      @driver.find_elements(:xpath, xpath_several_elements).each do |current_element|
-        next unless text_to_click.to_s == current_element.attribute('innerHTML')
-
-        begin
-          current_element.click
-        rescue Exception => e
-          webdriver_error("Error in click_on_one_of_several_by_text(#{xpath_several_elements}, #{text_to_click}): #{e.message}")
-        end
-        return true
-      end
-      false
-    end
-
-    def click_on_one_of_several_by_display(xpath_several_elements)
-      @driver.find_elements(:xpath, xpath_several_elements).each do |current_element|
-        if current_element.displayed?
-          current_element.click
-          return true
-        end
-      end
-      false
-    end
-
-    def click_on_one_of_several_by_parameter(xpath_several_elements, parameter_name, parameter_value)
-      @driver.find_elements(:xpath, xpath_several_elements).each do |current_element|
-        if current_element.attribute(parameter_name).include? parameter_value
-          current_element.click
-          return true
-        end
-      end
-      false
-    end
-
-    def click_on_one_of_several_xpath_by_number(xpath, number_of_element)
-      click_on_locator("(#{xpath})[#{number_of_element}]")
-    end
-
     def move_to_element(element)
       element = get_element(element) if element.is_a?(String)
       @driver.action.move_to(element).perform
@@ -380,9 +243,10 @@ module OnlyofficeWebdriverWrapper
     end
 
     def element_present?(xpath_name)
-      if xpath_name.is_a?(PageObject::Elements::Element)
+      case xpath_name
+      when PageObject::Elements::Element
         xpath_name.present?
-      elsif xpath_name.is_a?(Selenium::WebDriver::Element)
+      when Selenium::WebDriver::Element
         xpath_name.displayed?
       else
         @driver.find_element(:xpath, xpath_name)
@@ -392,24 +256,6 @@ module OnlyofficeWebdriverWrapper
       false
     end
 
-    def wait_until_element_present(xpath_name)
-      wait = Selenium::WebDriver::Wait.new(timeout: TIMEOUT_WAIT_ELEMENT) # seconds
-      begin
-        wait.until { get_element(xpath_name) }
-      rescue Selenium::WebDriver::Error::TimeOutError
-        webdriver_error("wait_until_element_present(#{xpath_name}) Selenium::WebDriver::Error::TimeOutError: timed out after 15 seconds")
-      end
-    end
-
-    def wait_until_element_disappear(xpath_name)
-      wait = Selenium::WebDriver::Wait.new(timeout: TIMEOUT_WAIT_ELEMENT) # seconds
-      begin
-        wait.until { get_element(xpath_name) ? false : true }
-      rescue Selenium::WebDriver::Error::TimeOutError
-        webdriver_error("wait_until_element_present(#{xpath_name}) Selenium::WebDriver::Error::TimeOutError: timed out after 15 seconds")
-      end
-    end
-
     def get_element_by_display(xpath_name)
       @driver.find_elements(:xpath, xpath_name).each do |element|
         return element if element.displayed?
@@ -461,18 +307,6 @@ module OnlyofficeWebdriverWrapper
       end
     end
 
-    def wait_until_element_visible(xpath_name, timeout = 15)
-      wait_until_element_present(xpath_name)
-      time = 0
-      while !element_visible?(xpath_name) && time < timeout
-        sleep(1)
-        time += 1
-      end
-      return unless time >= timeout
-
-      webdriver_error("Element #{xpath_name} not visible for #{timeout} seconds")
-    end
-
     # Check if any element of xpath is displayed
     # @param xpath_several_elements [String] xpath to check
     # @return [True, False] result of visibility
@@ -538,16 +372,6 @@ module OnlyofficeWebdriverWrapper
       @driver.find_elements(:xpath, xpath_several_elements).map { |element| element.text unless element.text == '' }.compact
     end
 
-    def set_parameter(xpath, attribute, attribute_value)
-      execute_javascript("document.evaluate(\"#{xpath.tr('"', "'")}\",document, null, XPathResult.ANY_TYPE, null ).iterateNext()." \
-                             "#{attribute}=\"#{attribute_value}\";")
-    end
-
-    def remove_attribute(xpath, attribute)
-      execute_javascript("document.evaluate(\"#{xpath}\",document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null)." \
-                             "singleNodeValue.removeAttribute('#{attribute}');")
-    end
-
     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))
@@ -574,22 +398,6 @@ module OnlyofficeWebdriverWrapper
       raise exception, "#{error_message}\n\nPage address: #{current_url}\n\nError #{webdriver_screenshot}"
     end
 
-    def wait_until(timeout = ::PageObject.default_page_wait, message = nil, wait_js: true, &block)
-      tries ||= 3
-      wait = Object::Selenium::WebDriver::Wait.new(timeout: timeout, message: message)
-      wait.until(&block)
-      if wait_js
-        wait.until { document_ready? }
-        wait.until { jquery_finished? }
-      end
-    rescue Selenium::WebDriver::Error::TimeOutError
-      webdriver_error("Wait until timeout: #{timeout} seconds in")
-    rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      OnlyofficeLoggerHelper.log("Wait until: rescuing from Stale Element error, #{tries} attempts remaining")
-      retry unless (tries -= 1).zero?
-      webdriver_error('Wait until: rescuing from Stale Element error failed after 3 tries')
-    end
-
     def wait_file_for_download(file_name, timeout = TIMEOUT_FILE_DOWNLOAD)
       full_file_name = "#{@download_directory}/#{file_name}"
       full_file_name = file_name if file_name[0] == '/'
@@ -603,11 +411,6 @@ module OnlyofficeWebdriverWrapper
       full_file_name
     end
 
-    def service_unavailable?
-      source = get_page_source
-      source.include?('Error 503')
-    end
-
     # Perform cleanup if something went wrong during tests
     # @param forced [True, False] should cleanup run in all cases
     def self.clean_up(forced = false)

data/lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Method to perform different clicks
+  module ClickMethods
+    # Click on specified element
+    # @param element [Selenium::WebDriver::Element] element to click
+    # @return [nil] nothing
+    def click(element)
+      element.click
+    end
+
+    # Click on locator
+    # @param xpath_name [String] xpath to click
+    # @param by_javascript [True, False] should be clicked by javascript
+    # @param count [Integer] count of clicks
+    def click_on_locator(xpath_name, by_javascript = false, count: 1)
+      element = get_element(xpath_name)
+      return webdriver_error("Element with xpath: #{xpath_name} not found") if element.nil?
+
+      if by_javascript
+        execute_javascript("document.evaluate(\"#{xpath_name}\", document, null, XPathResult.ANY_TYPE, null).iterateNext().click();")
+      else
+        begin
+          count.times { element.click }
+        rescue Selenium::WebDriver::Error::ElementNotVisibleError => e
+          webdriver_error(e.class, "Selenium::WebDriver::Error::ElementNotVisibleError: element not visible for xpath: #{xpath_name}")
+        rescue Exception => e
+          webdriver_error(e.class, "UnknownError #{e.message} #{xpath_name}")
+        end
+      end
+    end
+
+    # Click on one of several which displayed
+    # @param xpath_name [String] xpath to find element
+    # @return [nil]
+    def click_on_displayed(xpath_name)
+      element = get_element_by_display(xpath_name)
+      begin
+        element.is_a?(Array) ? element.first.click : element.click
+      rescue Exception => e
+        webdriver_error(e.class, "Exception #{e} in click_on_displayed(#{xpath_name})")
+      end
+    end
+
+    # Click on locator by coordinates
+    # @param xpath_name [String] xpath to click
+    # @param right_by [Integer] shift to right
+    # @param down_by [Integer] shift to bottom
+    # @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)
+      @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
+    end
+
+    # Click on one of several which displayed
+    # @param xpath_several_elements [String] xpath to find element
+    # @return [True, False] true if click successful, false if not found
+    def click_on_one_of_several_by_display(xpath_several_elements)
+      @driver.find_elements(:xpath, xpath_several_elements).each do |current_element|
+        if current_element.displayed?
+          current_element.click
+          return true
+        end
+      end
+      false
+    end
+
+    # Click on one of several xpath filtered by parameter and value
+    # @param xpath_several_elements [String] xpath to select
+    # @param parameter_name [String] parameter name
+    # @param parameter_value [String] parameter value
+    # @return [True, False] true if click successful, false if not found
+    def click_on_one_of_several_by_parameter(xpath_several_elements, parameter_name, parameter_value)
+      @driver.find_elements(:xpath, xpath_several_elements).each do |current_element|
+        if current_element.attribute(parameter_name).include? parameter_value
+          current_element.click
+          return true
+        end
+      end
+      false
+    end
+
+    # Perform right click on xpath
+    # @param xpath_name [String] xpath to click
+    # @return [nil]
+    def right_click(xpath_name)
+      wait_until_element_visible(xpath_name)
+
+      @driver.action.context_click(@driver.find_element(:xpath, xpath_name)).perform
+    end
+
+    # Perform right click on locator with specified coordinates
+    # @param xpath_name [String] xpath to click
+    # @param right_by [Integer] shift to right
+    # @param down_by [Integer] shift to bottom
+    # @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)
+      @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
+    end
+
+    # Perform double_click on element
+    # @param xpath_name [String] xpath to click
+    # @return [nil]
+    def double_click(xpath_name)
+      wait_until_element_visible(xpath_name)
+      @driver.action.move_to(@driver.find_element(:xpath, xpath_name)).double_click.perform
+    end
+
+    # Perform double_click on specified coordinates
+    # @param xpath_name [String] xpath to click
+    # @param right_by [Integer] shift to right
+    # @param down_by [Integer] shift to bottom
+    # @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
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/wait_until_methods.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Method to different wait_until methods
+  module WaitUntilMethods
+    # @return [Integer] default timeout for wait element
+    TIMEOUT_WAIT_ELEMENT = 15
+
+    def wait_until(timeout = ::PageObject.default_page_wait, message = nil, wait_js: true, &block)
+      tries ||= 3
+      wait = Object::Selenium::WebDriver::Wait.new(timeout: timeout, message: message)
+      wait.until(&block)
+      if wait_js
+        wait.until { document_ready? }
+        wait.until { jquery_finished? }
+      end
+    rescue Selenium::WebDriver::Error::TimeOutError
+      webdriver_error("Wait until timeout: #{timeout} seconds in")
+    rescue Selenium::WebDriver::Error::StaleElementReferenceError
+      OnlyofficeLoggerHelper.log("Wait until: rescuing from Stale Element error, #{tries} attempts remaining")
+      retry unless (tries -= 1).zero?
+      webdriver_error('Wait until: rescuing from Stale Element error failed after 3 tries')
+    end
+
+    def wait_until_element_visible(xpath_name, timeout = 15)
+      wait_until_element_present(xpath_name)
+      time = 0
+      while !element_visible?(xpath_name) && time < timeout
+        sleep(1)
+        time += 1
+      end
+      return unless time >= timeout
+
+      webdriver_error("Element #{xpath_name} not visible for #{timeout} seconds")
+    end
+
+    # Wait until some element present
+    # If timeout exceeded - raise an error
+    # @param xpath_name [String] xpath of element
+    # @param timeout [Integer] timeout to wait
+    # @return [Void]
+    def wait_until_element_present(xpath_name, timeout: TIMEOUT_WAIT_ELEMENT)
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout) # seconds
+      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: '\
+                            "timed out after #{timeout} seconds"
+        webdriver_error(e.class, timeout_message)
+      end
+    end
+
+    # Wait until some element disappear
+    # If timeout exceeded - raise an error
+    # @param xpath_name [String] xpath of element
+    # @param timeout [Integer] timeout to wait
+    # @return [Void]
+    def wait_until_element_disappear(xpath_name, timeout: TIMEOUT_WAIT_ELEMENT)
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout) # seconds
+      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: '\
+                            "timed out after #{timeout} seconds"
+        webdriver_error(e.class, timeout_message)
+      end
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb

@@ -40,5 +40,24 @@ module OnlyofficeWebdriverWrapper
       end
       0
     end
+
+    # Set element attribute
+    # @param xpath [String] element to select
+    # @param attribute [String] attribute to set
+    # @param attribute_value [String] value of attribute
+    # @return [String] result of execution
+    def set_attribute(xpath, attribute, attribute_value)
+      execute_javascript("#{dom_element_by_xpath(xpath)}.#{attribute}=\"#{attribute_value}\";")
+    end
+
+    alias set_parameter set_attribute
+
+    # Remove attribute of element
+    # @param xpath [String] xpath of element
+    # @param attribute [String] attribute to remove
+    # @return [String] result of execution
+    def remove_attribute(xpath, attribute)
+      execute_javascript("#{dom_element_by_xpath(xpath)}.removeAttribute('#{attribute}');")
+    end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_js_methods.rb

@@ -28,8 +28,13 @@ module OnlyofficeWebdriverWrapper
       execute_javascript("document.evaluate('#{xpath_name}', document, null, XPathResult.ANY_TYPE, null).iterateNext().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)
-      execute_javascript("return document.evaluate(\"#{xpath.tr('"', "'")}\",document, null, XPathResult.ANY_TYPE, null ).iterateNext().textContent")
+      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

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_style_helper.rb

@@ -10,26 +10,23 @@ module OnlyofficeWebdriverWrapper
       nil
     end
 
-    def set_style_parameter(xpath, attribute, attribute_value)
-      execute_javascript("document.evaluate(\"#{xpath.tr('"', "'")}\",document, null, XPathResult.ANY_TYPE, null ).iterateNext()." \
-                             "style.#{attribute}=\"#{attribute_value}\"")
-    end
-
+    # Set style attribute value of element
+    # @param xpath [String] xpath to set
+    # @param attribute [String] style param to set
+    # @param attribute_value [String] attribute value to set
+    # @return [String] result of execution
     def set_style_attribute(xpath, attribute, attribute_value)
-      execute_javascript("document.evaluate('#{xpath}',document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null)." \
-                             "singleNodeValue.style.#{attribute}=\"#{attribute_value}\"")
+      execute_javascript("#{dom_element_by_xpath(xpath)}.style.#{attribute}=\"#{attribute_value}\"")
     end
 
+    alias set_style_parameter set_style_attribute
+
     def set_style_show_by_xpath(xpath, move_to_center = false)
-      xpath = xpath.tr("'", '"')
-      execute_javascript('document.evaluate( \'' + xpath.to_s +
-                             '\' ,document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null ).singleNodeValue.style.display = "block";')
+      execute_javascript("#{dom_element_by_xpath(xpath)}.style.display = 'block';")
       return unless move_to_center
 
-      execute_javascript('document.evaluate( \'' + xpath.to_s +
-                             '\' ,document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null ).singleNodeValue.style.left = "410px";')
-      execute_javascript('document.evaluate( \'' + xpath.to_s +
-                             '\' ,document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null ).singleNodeValue.style.top = "260px";')
+      execute_javascript("#{dom_element_by_xpath(xpath)}.style.left = '410px';")
+      execute_javascript("#{dom_element_by_xpath(xpath)}.style.top = '260px';")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -148,6 +148,8 @@ files:
 - lib/onlyoffice_webdriver_wrapper/name.rb
 - 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/wait_until_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_alert_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_browser_info_helper.rb
@@ -184,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem