onlyoffice_webdriver_wrapper 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0044c9d5e8971a853777153b56dabc039847c52a6c5fc980cf8da9f569bd9a27
-  data.tar.gz: 523f06a1503fca9cdcb64972f90801212aad5ad6f128992d047d866dd14b8c36
+  metadata.gz: f98ac75fa3bf47f7ada257812f98097c9dc65d183ca4f6da5d5b42b2c410d84d
+  data.tar.gz: 3cbcf38f96e27e4f8f9a71a08961b83a450c3d3da11fe970417e6ddc81bb6a07
 SHA512:
-  metadata.gz: 2904eb6b01834f659d2f438b9407935cfb9bae36c8c9b22d8cc4148a84dc7d2ed6478fe6924fa14cc96deb134dd5da7cecd7d2968a84a3d2a76d0cd05d7b422d
-  data.tar.gz: 9908660e5563f7912d52c2770054d5577a2e219323a837aa63ed92314a9764660b02dae4082085785298e43e41455b181faad96c2fb0643e995b9a3b963d3f0f
+  metadata.gz: 64f12991857161f2234fa7f0b3d22b1da3fdb7c0b8af45fb6a8554cc53fea1a9278635429a2fc3ea8395f64bd58a785c65ce9ea9677e5b9881c7c040cc9ffd6c
+  data.tar.gz: 6dc715859f6b85af142b13fa96d54ab0ca13bd221116076ad3a79eeeb599d2bb6a2c6bac613c4c4097b7f678a2f0441528a8c76532efe6ceb4a55fb006e048c1

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -2,6 +2,6 @@
 
 module OnlyofficeWebdriverWrapper
   module Version
-    STRING = '0.3.2'
+    STRING = '0.3.3'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -7,6 +7,7 @@ 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'
@@ -25,6 +26,7 @@ module OnlyofficeWebdriverWrapper
   # noinspection RubyTooManyMethodsInspection, RubyInstanceMethodNamingConvention, RubyParameterNamingConvention
   class WebDriver
     include ChromeHelper
+    include ClickMethods
     include FirefoxHelper
     include RubyHelper
     include WaitUntilMethods
@@ -124,20 +126,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
@@ -251,119 +239,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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -148,6 +148,7 @@ 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
@@ -185,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