onlyoffice_webdriver_wrapper 1.17.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a253fddab546c17234e5c7e2c5fcccf26dfc8107a912ccffe88048632686ea
-  data.tar.gz: 873a53e6dc72354e42706186075d03f8540130f6bb160026b1b7df8e2784d21d
+  metadata.gz: f9928178651f912e702f33d64f7acfa5272849d1ec165aebef19d6383f415afd
+  data.tar.gz: 72d5fe781262d499a74a80f993a2c3ad9be1224be7af554fd5eba261091aa13a
 SHA512:
-  metadata.gz: 7c941f9158ad88622735940e6ffb0164b40acc7859598ad1ee1d66b8e3c6a0fca8a51fd7c7829726f0833037878c21f9618d5fe37858fb6b7845f9c350a1190a
-  data.tar.gz: c17e1cf3762bb57e7b5820e2ca3ce127e1245b76953aecc5378c06444752b2bebfbfb518b3661d352453e05727bb24b041f98a5b2185aafa8fd2b0a2f91e6de3
+  metadata.gz: d4372b1f24a39362c1cb47980a4b6575655048947c68e2d3b17ce79c4f28f1b49d15674aee039ada8c89dbdf7082a07b5fb81be1951c54dd02388ed3455a91e9
+  data.tar.gz: b8559ca2393335b34af1597031fff713163f805418e2ea2d5c183f2f66723b23c5c3f53f6564221db1f3f78effd950a87f199af11dd7122006cd86cc9634a6fd

data/lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chrome_version_helper.rb

@@ -27,7 +27,7 @@ module OnlyofficeWebdriverWrapper
       return default_mac if OSHelper.mac? || force_os == :mac
       return default_linux if (chrome_version == unknown_chrome_version) || force_os == :linux
 
-      chromedriver_path_cur_chrome
+      chromedriver_path_for_version(chrome_version.segments.first)
     end
 
     private
@@ -42,13 +42,16 @@ module OnlyofficeWebdriverWrapper
       Dir["#{File.dirname(__FILE__)}/chromedriver_bin/chromedriver_linux_*"].max
     end
 
+    # @param [String] major_version major version of chrome
     # @return [String] path to chromedriver of version
-    def chromedriver_path_cur_chrome
-      file_path = "#{File.dirname(__FILE__)}/chromedriver_bin/chromedriver_linux_#{chrome_version.segments.first}"
-
-      return file_path if File.exist?(file_path)
-
-      OnlyofficeLoggerHelper.log("Cannot file chromedriver by version #{chrome_version.version}. Using Default")
+    def chromedriver_path_for_version(major_version)
+      file_path = "#{File.dirname(__FILE__)}/chromedriver_bin/chromedriver_linux_#{major_version}"
+      if File.exist?(file_path)
+        OnlyofficeLoggerHelper.log("Chromedriver found by version #{major_version}. Using it")
+        return file_path
+      end
+
+      OnlyofficeLoggerHelper.log("Cannot file chromedriver by version #{major_version}. Using Default")
       default_linux
     end
   end

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.17.0'
+    STRING = '1.19.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/scroll_methods.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Methods for scrolling page
+  module ScrollMethods
+    # Scroll list by pixel count
+    # @param [String] list_xpath how to detect this list
+    # @param [Integer] pixels how much to scroll
+    # @return [void]
+    def scroll_list_by_pixels(list_xpath, pixels)
+      element = dom_element_by_xpath(list_xpath)
+      execute_javascript("$(#{element}).scrollTop(#{pixels})")
+    end
+
+    # Get current element scroll position
+    # @param [String] list_xpath how to detect this list
+    # @return [Float] position in pixels
+    def current_scroll_position(xpath)
+      execute_javascript("return $(#{dom_element_by_xpath(xpath)}).scrollTop()")
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_alert_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'net/protocol'
+
 module OnlyofficeWebdriverWrapper
   # Methods for working with alerts
   module WebdriverAlertHelper

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_screenshot_helper.rb

@@ -60,21 +60,12 @@ module OnlyofficeWebdriverWrapper
         link = get_screenshot_and_upload("#{screenshot_folder}/#{screenshot_name}.png")
       rescue StandardError => e
         OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. Trying to get headless screenshot")
-        if @headless.headless_instance.nil?
-          system_screenshot("/tmp/#{screenshot_name}.png")
-          begin
-            link = publish_screenshot("/tmp/#{screenshot_name}.png")
-          rescue StandardError => e
-            OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. System screenshot #{link}")
-          end
+        if @headless.running?
+          @headless.take_screenshot("#{screenshot_folder}/#{screenshot_name}.png")
         else
-          @headless.take_screenshot("/tmp/#{screenshot_name}.png")
-          begin
-            link = publish_screenshot("/tmp/#{screenshot_name}.png")
-          rescue StandardError => e
-            OnlyofficeLoggerHelper.log("Error in get screenshot: #{e}. Headless screenshot #{link}")
-          end
+          system_screenshot("#{screenshot_folder}/#{screenshot_name}.png")
         end
+        link = publish_screenshot("#{screenshot_folder}/#{screenshot_name}.png")
       end
       "screenshot: #{link}"
     end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -10,6 +10,7 @@ require_relative 'helpers/firefox_helper'
 require_relative 'webdriver/click_methods'
 require_relative 'webdriver/element_getters'
 require_relative 'webdriver/get_text_methods'
+require_relative 'webdriver/scroll_methods'
 require_relative 'webdriver/select_list_methods'
 require_relative 'webdriver/wait_until_methods'
 require_relative 'webdriver/webdriver_alert_helper'
@@ -35,6 +36,7 @@ module OnlyofficeWebdriverWrapper
     include ChromeHelper
     include ClickMethods
     include GetTextMethods
+    include ScrollMethods
     include SelectListMethods
     include FirefoxHelper
     include RubyHelper
@@ -55,6 +57,8 @@ module OnlyofficeWebdriverWrapper
     include WebdriverBrowserLogHelper
     # @return [Integer] Default timeout for waiting to file to download
     TIMEOUT_FILE_DOWNLOAD = 100
+    # @return [Array<Symbol>] list of supported browsers
+    SUPPORTED_BROWSERS = %i[firefox chrome].freeze
     # @return [Array, String] default switches for chrome
     attr_accessor :driver
     # @return [Symbol] browser to use
@@ -73,6 +77,7 @@ module OnlyofficeWebdriverWrapper
     def initialize(browser = :firefox, params = {})
       raise WebdriverSystemNotSupported, 'Your OS is not 64 bit. It is not supported' unless os_64_bit?
 
+      ensure_supported_browser(browser)
       @device = params.fetch(:device, :desktop_linux)
       @record_video = params.fetch(:record_video, true)
       @headless = HeadlessHelper.new(record_video: record_video)
@@ -87,18 +92,18 @@ module OnlyofficeWebdriverWrapper
         @driver = start_firefox_driver
       when :chrome
         @driver = start_chrome_driver
-      else
-        raise("Unknown Browser: #{browser}")
       end
       @browser_running = true
     end
 
-    # Scroll list by pixel count
-    # @param [String] list_xpath how to detect this list
-    # @param [Integer] pixels how much to scroll
+    # Ensure that browser is supported
+    # @param [Symbol] browser to check
+    # @raise [RuntimeError] if browser is not supported
     # @return [void]
-    def scroll_list_by_pixels(list_xpath, pixels)
-      execute_javascript("$(#{dom_element_by_xpath(list_xpath)}).scrollTop(#{pixels})")
+    def ensure_supported_browser(browser)
+      return if SUPPORTED_BROWSERS.include?(browser)
+
+      raise("Unknown Browser: #{browser}")
     end
 
     # Open dropdown selector, like 'Color Selector', which has no element id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.19.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -117,152 +117,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
 description: ONLYOFFICE Webdriver Wrapper Gem. Used in QA
 email:
 - shockwavenn@gmail.com
@@ -275,9 +129,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_110
-- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_111
-- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_112
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_114
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_115
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_116
 - 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
@@ -293,6 +147,7 @@ files:
 - lib/onlyoffice_webdriver_wrapper/webdriver/click_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/element_getters.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/get_text_methods.rb
+- lib/onlyoffice_webdriver_wrapper/webdriver/scroll_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/select_list_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/wait_until_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_alert_helper.rb
@@ -328,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem