onlyoffice_webdriver_wrapper 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fb4a9f6a9a01001b6fd2bcd65984dbe4b7ad3a3dc96e9d123af7799aaaa9e65
-  data.tar.gz: 44b8adf3e335448be9ea08a075ddbfa16e25b542586623ae124ae1c4d0eb315a
+  metadata.gz: 328cc206dfe7a1b7bdca4e61b4b035fe2ec96c56323302be27ffea9c2dcde56d
+  data.tar.gz: e8d09c9790c5911e6415eff49fc70d61eda46f60f8c5affa922850ee66107d68
 SHA512:
-  metadata.gz: 6e17a6086204cbb60b4e880b6f99ad2cfa95646ee61c108f7fb7b2f34d39b16a7f7fef56c69bc7a5b90b54a779aba5a483f3029f8fd0f0775d0c8bb95a8d4606
-  data.tar.gz: 2baa1fc5b0cb82bbb9e2d6d6ad5051eaa951ba84e374fda07f83e2b37816485edb32cd47976942b0c2dc1531267fe2d66b7cba1f968a3c44d690c7b5e7196262
+  metadata.gz: 97c3e656c469845ef2f6d4e643ba4625043d608456d544d5afc62aeeb2679f007349a2e6fbfc9d8c217a4c797f00ddd2577ffd49177a892a20a2d68553321132
+  data.tar.gz: cd6069601e477776ed59f791efc4e140fbfcd867cb427b786907764c469f2a3368a6b3afc2cf1c7fd79c263713618ee62297a6fe10d2a9fb2a2d56519c250817

data/lib/onlyoffice_webdriver_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'onlyoffice_logger_helper'
 require_relative 'onlyoffice_webdriver_wrapper/helpers/headless_helper'
 require_relative 'onlyoffice_webdriver_wrapper/helpers/os_helper'

data/lib/onlyoffice_webdriver_wrapper/dimensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Class for working with cursor coordinates
   class Dimensions
@@ -12,5 +14,9 @@ module OnlyofficeWebdriverWrapper
     alias height top
     alias x left
     alias y top
+
+    def to_s
+      "Dimensions(left: #{@left}, top: #{@top})"
+    end
   end
 end

data/lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Class for working with Chrome
   module ChromeHelper
@@ -14,6 +16,10 @@ module OnlyofficeWebdriverWrapper
       File.join(File.dirname(__FILE__), driver_name)
     end
 
+    def chrome_service
+      @chrome_service ||= Selenium::WebDriver::Chrome::Service.new(path: chromedriver_path)
+    end
+
     # @return [Webdriver::Chrome] Chrome webdriver
     def start_chrome_driver
       prefs = {
@@ -22,8 +28,8 @@ module OnlyofficeWebdriverWrapper
           default_directory: download_directory
         },
         profile: {
-          default_content_settings: {
-            'multiple-automatic-downloads' => 1
+          default_content_setting_values: {
+            'automatic_downloads': 1
           }
         },
         credentials_enable_service: false
@@ -31,13 +37,14 @@ module OnlyofficeWebdriverWrapper
       caps = Selenium::WebDriver::Remote::Capabilities.chrome
       caps[:logging_prefs] = { browser: 'ALL' }
       caps[:proxy] = Selenium::WebDriver::Proxy.new(ssl: "#{@proxy.proxy_address}:#{@proxy.proxy_port}") if @proxy
+      caps['chromeOptions'] = { w3c: false }
       if ip_of_remote_server.nil?
         switches = add_useragent_to_switches(DEFAULT_CHROME_SWITCHES)
         options = Selenium::WebDriver::Chrome::Options.new(args: switches,
                                                            prefs: prefs)
         webdriver_options = { options: options,
                               desired_capabilities: caps,
-                              driver_path: chromedriver_path }
+                              service: chrome_service }
         begin
           driver = Selenium::WebDriver.for :chrome, webdriver_options
         rescue Selenium::WebDriver::Error::WebDriverError,

data/lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper.rb

@@ -1,9 +1,15 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module for working with firefox
   module FirefoxHelper
+    def firefox_service
+      geckodriver = File.join(File.dirname(__FILE__), 'bin/geckodriver')
+      @firefox_service ||= Selenium::WebDriver::Firefox::Service.new(path: geckodriver)
+    end
+
     # @return [Webdriver::Firefox] firefox webdriver
     def start_firefox_driver
-      geckodriver = File.join(File.dirname(__FILE__), 'bin/geckodriver')
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile['browser.download.folderList'] = 2
       profile['browser.helperApps.neverAsk.saveToDisk'] = 'application/doct, application/mspowerpoint, application/msword, application/octet-stream, application/oleobject, application/pdf, application/powerpoint, application/pptt, application/rtf, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/vnd.oasis.opendocument.spreadsheet, application/vnd.oasis.opendocument.text, application/vnd.openxmlformats-officedocument.presentationml.presentation, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.openxmlformats-officedocument.wordprocessingml.document, application/x-compressed, application/x-excel, application/xlst, application/x-msexcel, application/x-mspowerpoint, application/x-rtf, application/x-zip-compressed, application/zip, image/jpeg, image/pjpeg, image/pjpeg, image/x-jps, message/rfc822, multipart/x-zip, text/csv, text/html, text/html, text/plain, text/richtext'
@@ -14,7 +20,7 @@ module OnlyofficeWebdriverWrapper
       caps = Selenium::WebDriver::Remote::Capabilities.firefox
       caps[:proxy] = Selenium::WebDriver::Proxy.new(ssl: "#{@proxy.proxy_address}:#{@proxy.proxy_port}") if @proxy
       if ip_of_remote_server.nil?
-        driver = Selenium::WebDriver.for :firefox, options: options, driver_path: geckodriver, desired_capabilities: caps
+        driver = Selenium::WebDriver.for :firefox, options: options, service: firefox_service, desired_capabilities: caps
         driver.manage.window.size = Selenium::WebDriver::Dimension.new(headless.resolution_x, headless.resolution_y) if headless.running?
         driver
       else

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'headless_helper/real_display_tools'
 require_relative 'headless_helper/ruby_helper'
 require 'headless'

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/real_display_tools.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # module for getting info about real display
   module RealDisplayTools

data/lib/onlyoffice_webdriver_wrapper/helpers/headless_helper/ruby_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module for check ruby info
   module RubyHelper

data/lib/onlyoffice_webdriver_wrapper/helpers/os_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Stuff for working with OS families
   class OSHelper

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   module Version
-    STRING = '0.0.2'.freeze
+    STRING = '0.1.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'onlyoffice_file_helper'
 require 'page-object'
 require 'securerandom'
@@ -10,7 +12,6 @@ require_relative 'webdriver/webdriver_attributes_helper'
 require_relative 'webdriver/webdriver_browser_info_helper'
 require_relative 'webdriver/webdriver_type_helper'
 require_relative 'webdriver/webdriver_exceptions'
-require_relative 'webdriver/webdriver_extension'
 require_relative 'webdriver/webdriver_helper'
 require_relative 'webdriver/webdriver_js_methods'
 require_relative 'webdriver/webdriver_screenshot_helper'
@@ -41,6 +42,8 @@ module OnlyofficeWebdriverWrapper
     # @return [Array, String] default switches for chrome
     attr_accessor :driver
     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
     attr_accessor :ip_of_remote_server
@@ -74,6 +77,7 @@ module OnlyofficeWebdriverWrapper
       else
         raise 'Unknown Browser: ' + browser.to_s
       end
+      @browser_running = true
     end
 
     def add_web_console_error(log)
@@ -94,6 +98,8 @@ module OnlyofficeWebdriverWrapper
     end
 
     def quit
+      return unless browser_running
+
       begin
         @driver.execute_script('window.onbeforeunload = null') # off popup window
       rescue StandardError
@@ -107,6 +113,7 @@ module OnlyofficeWebdriverWrapper
       alert_confirm
       @headless.stop
       FileUtils.remove_dir(@download_directory) if Dir.exist?(@download_directory)
+      @browser_running = false
     end
 
     def get_element(object_identification)
@@ -199,12 +206,11 @@ module OnlyofficeWebdriverWrapper
     end
 
     def remove_class_by_jquery(selector, class_name)
-      execute_javascript('cd(window.frames[0])')
-      execute_javascript("$('#{selector}').removeClass('#{class_name}');")
+      execute_javascript("#{jquery_selector_by_xpath(selector)}.removeClass('#{class_name}');")
     end
 
     def add_class_by_jquery(selector, class_name)
-      execute_javascript("$('#{selector}').addClass('#{class_name}');")
+      execute_javascript("#{jquery_selector_by_xpath(selector)}.addClass('#{class_name}');")
     end
 
     # Perform drag'n'drop action in one element (for example on big canvas area)
@@ -219,15 +225,14 @@ module OnlyofficeWebdriverWrapper
     # * +mouse_release+ - release mouse after move
     def drag_and_drop(xpath, x1, y1, x2, y2, mouse_release: true)
       canvas = get_element(xpath)
-      if mouse_release
-        @driver.action.move_to(canvas, x1.to_i, y1.to_i).click_and_hold.move_by(x2, y2).release.perform
-      else
-        @driver.action.move_to(canvas, x1.to_i, y1.to_i).click_and_hold.move_by(x2, y2).perform
-      end
-    rescue ArgumentError
-      raise "Replace 'click_and_hold(element)' to 'click_and_hold(element = nil)' in action_builder.rb"
-    rescue TypeError => e
-      webdriver_error("drag_and_drop(#{xpath}, #{x1}, #{y1}, #{x2}, #{y2}) TypeError: #{e.message}")
+
+      move_action = @driver.action
+                           .move_to(canvas, x1.to_i, y1.to_i)
+                           .click_and_hold
+                           .move_by(x2, y2)
+      move_action = move_action.release if mouse_release
+
+      move_action.perform
     end
 
     # Perform drag'n'drop one whole element

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_alert_helper.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Methods for working with alerts
   module WebdriverAlertHelper
     def alert_confirm
-      @driver.switch_to.alert.accept
-    rescue StandardError
-      Selenium::WebDriver::Error::NoAlertOpenError
+      @driver.switch_to.alert.accept if alert_exists?
     end
 
     # Check if alert exists
@@ -12,7 +12,7 @@ module OnlyofficeWebdriverWrapper
     def alert_exists?
       @driver.switch_to.alert.text
       true
-    rescue Selenium::WebDriver::Error::NoAlertOpenError, Selenium::WebDriver::Error::NoSuchAlertError
+    rescue Selenium::WebDriver::Error::NoSuchAlertError, Errno::ECONNREFUSED
       false
     end
 

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module with methods to work with attributes
   module WebdriverAttributesHelper

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_browser_info_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module for working with browser metadata
   module WebdriverBrowserInfo

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_browser_log_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Methods for working with browser console logs
   module WebdriverBrowserLogHelper

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   class WebdriverSystemNotSupported < StandardError; end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'tempfile'
 

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_js_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Methods for webdriver for calling Javascript
   module WebdriverJsMethods
@@ -9,6 +11,11 @@ module OnlyofficeWebdriverWrapper
       webdriver_error("Exception #{e} in execute_javascript: #{script}")
     end
 
+    # @return [String] string to select by xpath
+    def jquery_selector_by_xpath(xpath)
+      "$(document.evaluate('#{xpath}', document, null, XPathResult.ANY_TYPE, null).iterateNext())"
+    end
+
     def type_to_locator_by_javascript(xpath_name, text)
       escaped_text = text.gsub('\\', '\\\\\\\\').gsub('"', '\\"').gsub("\n", '\\n')
       execute_javascript("document.evaluate('#{xpath_name}', document, null, XPathResult.ANY_TYPE, null).iterateNext().value=\"#{escaped_text}\";")

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_screenshot_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'onlyoffice_s3_wrapper'
 module OnlyofficeWebdriverWrapper
   # Working with screenshots

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_style_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Webdriver style helper
   module WebdriverStyleHelper
@@ -12,7 +14,7 @@ module OnlyofficeWebdriverWrapper
         el_style = element.attribute('style')
         unless el_style.empty?
           found_style = el_style.split(';').find { |curr_param| curr_param.include?(style) }
-          found_style.gsub(/\s?#{ style }:/, '') unless found_style.nil?
+          found_style&.gsub(/\s?#{style}:/, '')
         end
       end.compact
     end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_tab_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module for work with tabs
   module WebdriverTabHelper
@@ -17,7 +19,9 @@ module OnlyofficeWebdriverWrapper
       OnlyofficeLoggerHelper.log("Resize current window to #{width}x#{height}")
     end
 
-    def switch_to_popup
+    # @param after_switch_timeout [Integer] wait after switch to window
+    # non-zero to workaround bug with page load hanging up after switch
+    def switch_to_popup(after_switch_timeout: 3)
       counter = 0
       while tab_count < 2 && counter < 30
         sleep 1
@@ -27,7 +31,7 @@ module OnlyofficeWebdriverWrapper
       list_of_handlers = @driver.window_handles
       last_window_handler = list_of_handlers.last
       @driver.switch_to.window(last_window_handler)
-      sleep 1 # Do not remove until problem with page loading stop resolved
+      sleep(after_switch_timeout) # Do not remove until problem with page loading stop resolved
     end
 
     # Get tab count

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_type_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Class for helping with type stuff
   module WebdriverTypeHelper
@@ -56,23 +58,6 @@ module OnlyofficeWebdriverWrapper
       element.send_keys text_to_send
     end
 
-    def type_text_by_symbol(xpath_name, text_to_send, clear_content = true, click_on_it = false, by_action = false, by_element_send_key = false)
-      click_on_locator(xpath_name) if click_on_it
-      element = get_element(xpath_name)
-      if clear_content
-        element.clear
-        click_on_locator(xpath_name) if click_on_it
-      end
-      text_to_send.scan(/./).each do |symbol|
-        sleep(0.3)
-        if (@browser != :chrome && !by_action) || by_element_send_key
-          send_keys(element, symbol, :element_send_key)
-        else
-          send_keys(element, symbol, by_action)
-        end
-      end
-    end
-
     def send_keys(xpath_name, text_to_send, by_action = true)
       element = get_element(xpath_name)
       @driver.action.click(element).perform if @browser == :firefox

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_user_agent_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module OnlyofficeWebdriverWrapper
   # Module for wokring with webdriver useragent
   module WebdriverUserAgentHelper
-    USERAGENT_ANDROID_PHONE = 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MDB08M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537.36'.freeze
-    USERAGENT_IPHONE = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13F69 Safari/601.1'.freeze
-    USERAGENT_IPAD_AIR_2_SAFARI = 'Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A5346a Safari/602.1'.freeze
-    USERAGENT_NEXUS_10_CHROME = 'Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.23 Safari/537.36'.freeze
+    USERAGENT_ANDROID_PHONE = 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MDB08M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537.36'
+    USERAGENT_IPHONE = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13F69 Safari/601.1'
+    USERAGENT_IPAD_AIR_2_SAFARI = 'Mozilla/5.0 (iPad; CPU OS 10_0 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A5346a Safari/602.1'
+    USERAGENT_NEXUS_10_CHROME = 'Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.23 Safari/537.36'
 
     # @return [String] user agent string for current device
     def user_agent_for_device

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavel Lobashov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 3.142.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 3.142.6
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '6'
 description: onlyoffice_webdriver_wrapper
 email:
 - shockwavenn@gmail.com
@@ -136,7 +136,6 @@ files:
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_browser_info_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_browser_log_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_exceptions.rb
-- lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_extension.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_js_methods.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_screenshot_helper.rb
@@ -156,15 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_extension.rb

@@ -1,2 +0,0 @@
-Selenium::WebDriver::Service::START_TIMEOUT = 120
-Selenium::WebDriver::Service::STOP_TIMEOUT = 120