onlyoffice_webdriver_wrapper 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7dd9754453bdfc98d527929ed558a8a8d7246b25e1ddd836b0af4a57ffc4d55
-  data.tar.gz: 49ca15eea9259e832423665aa0c7a86cc5d2afc17068c65fc6990c272a88091e
+  metadata.gz: 0044c9d5e8971a853777153b56dabc039847c52a6c5fc980cf8da9f569bd9a27
+  data.tar.gz: 523f06a1503fca9cdcb64972f90801212aad5ad6f128992d047d866dd14b8c36
 SHA512:
-  metadata.gz: c7dbe1f1368fb5a3f0b027ede5abc619e97dca747709066fe3fd0d3d7c5c2d89d01a7e45a0eb034652fe238fbb89959fe86deb7dd307ad28b24627381842eba5
-  data.tar.gz: aa67c58fe56ac730be39894b7aa316dc6e134938c89d13f0c46000d18008244f3d90d631ad0d50ae88a25e77c2808870dc470d7d61b582581376f65335c49a3b
+  metadata.gz: 2904eb6b01834f659d2f438b9407935cfb9bae36c8c9b22d8cc4148a84dc7d2ed6478fe6924fa14cc96deb134dd5da7cecd7d2968a84a3d2a76d0cd05d7b422d
+  data.tar.gz: 9908660e5563f7912d52c2770054d5577a2e219323a837aa63ed92314a9764660b02dae4082085785298e43e41455b181faad96c2fb0643e995b9a3b963d3f0f

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -2,6 +2,6 @@
 
 module OnlyofficeWebdriverWrapper
   module Version
-    STRING = '0.3.1'
+    STRING = '0.3.2'
   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/wait_until_methods'
 require_relative 'webdriver/webdriver_alert_helper'
 require_relative 'webdriver/webdriver_attributes_helper'
 require_relative 'webdriver/webdriver_browser_info_helper'
@@ -26,6 +27,7 @@ module OnlyofficeWebdriverWrapper
     include ChromeHelper
     include FirefoxHelper
     include RubyHelper
+    include WaitUntilMethods
     include WebdriverAlertHelper
     include WebdriverAttributesHelper
     include WebdriverBrowserInfo
@@ -37,7 +39,6 @@ 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
@@ -392,24 +393,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 +444,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
@@ -574,22 +545,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] == '/'

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 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-06-30 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/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