onlyoffice_webdriver_wrapper 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330c079d2c339d796d82e107ba37334d20240ede30025e32c0d113f910e5b3c2
-  data.tar.gz: a26e4e28f96fabfb556ae5cb968591a2fb96096b0d8fc7d8db44f47c3ad68e55
+  metadata.gz: 198918d5a397566f6099da61229da418520359f28a8eae58c554291303319ccb
+  data.tar.gz: a4f7e7764c1a49456b5eed0d8a851a20eb6a3fc38890b222c66540927b03fa11
 SHA512:
-  metadata.gz: 6ecdcce1acc5850b9f8025d4e2b79d00f36fb5347b1e55f2bfda709d44bf337c05c04048989f4ed35fdde5eaa5cf5026a821165a53a8e86f1b73d4fa3c1421dc
-  data.tar.gz: d7dffb5e28cba23b06e54e9799c1f533ff244eaa36698b000d744a5965fa795ee64fdac43be21da89555e2eba2f5dcb078997c2b3cee61473e727af80922d98b
+  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.5'
+    STRING = '0.4.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -44,13 +44,15 @@ module OnlyofficeWebdriverWrapper
     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
@@ -241,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)
@@ -369,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))

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless