Use Ferrum::Utils

Author: route

lib/capybara/cuprite/page.rb

@@ -68,7 +68,7 @@ def dismiss_prompt
       end
 
       def find_modal(options)
-        start = Ferrum.monotonic_time
+        start = Ferrum::Utils::ElapsedTime.monotonic_time
         timeout = options.fetch(:wait, browser.timeout)
         expect_text = options[:text]
         expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
@@ -79,7 +79,7 @@ def find_modal(options)
           modal_text = @modal_messages.shift
           raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
         rescue Capybara::ModalNotFound => e
-          raise e, not_found_msg if Ferrum.timeout?(start, timeout)
+          raise e, not_found_msg if Ferrum::Utils::ElapsedTime.timeout?(start, timeout)
 
           sleep(MODAL_WAIT)
           retry

spec/features/driver_spec.rb

@@ -518,7 +518,7 @@ def create_screenshot(file, *args)
         expect(@driver.evaluate_script("window.result")).to eq(3)
       end
 
-      it "supports stopping the session", skip: Ferrum.windows? do
+      it "supports stopping the session", skip: Ferrum::Utils::Platform.windows? do
         driver = Capybara::Cuprite::Driver.new(nil)
         pid = driver.browser.process.pid
 
@@ -1330,7 +1330,7 @@ def create_screenshot(file, *args)
         it "sends sequences with modifiers and symbols" do
           input = @session.find(:css, "#empty_input")
 
-          keys = Ferrum.mac? ? %i[Alt Left] : %i[Ctrl Left]
+          keys = Ferrum::Utils::Platform.mac? ? %i[Alt Left] : %i[Ctrl Left]
 
           input.native.send_keys("t", "r", "i", "n", "g", keys, "s")
 
@@ -1340,7 +1340,7 @@ def create_screenshot(file, *args)
         it "sends sequences with multiple modifiers and symbols" do
           input = @session.find(:css, "#empty_input")
 
-          keys = Ferrum.mac? ? %i[Alt Shift Left] : %i[Ctrl Shift Left]
+          keys = Ferrum::Utils::Platform.mac? ? %i[Alt Shift Left] : %i[Ctrl Shift Left]
 
           input.native.send_keys("t", "r", "i", "n", "g", keys, "s")
 

spec/features/session_spec.rb

@@ -1035,7 +1035,7 @@
       end
     end
 
-    if Ferrum.mri? && !Ferrum.windows?
+    if Ferrum::Utils::Platform.mri? && !Ferrum::Utils::Platform.windows?
       require "pty"
       require "timeout"