Fix rubocop warnings

Author: route

lib/capybara/cuprite/browser.rb

@@ -81,13 +81,10 @@ def window_handles
 
       def within_window(locator = nil)
         original = window_handle
+        raise Ferrum::NoSuchPageError unless window_handles.include?(locator)
 
-        if window_handles.include?(locator)
-          switch_to_window(locator)
-          yield
-        else
-          raise Ferrum::NoSuchPageError
-        end
+        switch_to_window(locator)
+        yield
       ensure
         switch_to_window(original)
       end

lib/capybara/cuprite/driver.rb

@@ -35,6 +35,8 @@ def initialize(app, options = {})
         @options[:save_path] = Capybara.save_path.to_s if Capybara.save_path
 
         ENV["FERRUM_DEBUG"] = "true" if ENV["CUPRITE_DEBUG"]
+
+        super()
       end
 
       def needs_server?
@@ -202,10 +204,9 @@ def clear_network_traffic
         browser.network.clear(:traffic)
       end
 
-      def set_proxy(ip, port, type = nil, user = nil, password = nil, bypass = nil)
+      def set_proxy(host, port, user = nil, password = nil, bypass = nil)
         @options[:browser_options] ||= {}
-        server = type ? "#{type}=#{ip}:#{port}" : "#{ip}:#{port}"
-        @options[:browser_options].merge!("proxy-server" => server)
+        @options[:browser_options].merge!("proxy-server" => "#{host}:#{port}")
         @options[:browser_options].merge!("proxy-bypass-list" => bypass) if bypass
         browser.network.authorize(type: :proxy, user: user, password: password) do |request, _index, _total|
           request.continue

lib/capybara/cuprite/errors.rb

@@ -9,6 +9,7 @@ class ClientError < Error
 
       def initialize(response)
         @response = response
+        super()
       end
     end
 

lib/capybara/cuprite/node.rb

@@ -257,19 +257,15 @@ def scroll_element_to_location(element, location)
       end
 
       def scroll_to_location(location)
-        scroll_y = case location
-                   when :top
-                     "0"
-                   when :bottom
-                     "arguments[0].scrollHeight"
-                   when :center
-                     "(arguments[0].scrollHeight - arguments[0].clientHeight)/2"
-                   end
+        height = { top: "0",
+                   bottom: "arguments[0].scrollHeight",
+                   center: "(arguments[0].scrollHeight - arguments[0].clientHeight)/2" }
+
         driver.execute_script <<~JS, self
           if (arguments[0].scrollTo){
-            arguments[0].scrollTo(0, #{scroll_y});
+            arguments[0].scrollTo(0, #{height[location]});
           } else {
-            arguments[0].scrollTop = #{scroll_y};
+            arguments[0].scrollTop = #{height[location]};
           }
         JS
       end

lib/capybara/cuprite/page.rb

@@ -182,11 +182,9 @@ def prepare_page
       def find_position(node, **options)
         node.find_position(**options)
       rescue Ferrum::BrowserError => e
-        if e.message == "Could not compute content quads."
-          raise MouseEventFailed, "MouseEventFailed: click, none, 0, 0"
-        else
-          raise
-        end
+        raise MouseEventFailed, "MouseEventFailed: click, none, 0, 0" if e.message == "Could not compute content quads."
+
+        raise
       end
 
       def active_frame

spec/features/driver_spec.rb

@@ -1507,7 +1507,12 @@ def create_screenshot(file, *args)
 
         it "can return structures with elements" do
           @session.visit("/cuprite/send_keys")
-          result = @session.driver.evaluate_script(%({ a: document.getElementById("empty_input"), b: { c: document.querySelectorAll("#empty_textarea, #filled_textarea") } }))
+          result = @session.driver.evaluate_script <<~JS
+            {
+              a: document.getElementById("empty_input"),
+              b: { c: document.querySelectorAll("#empty_textarea, #filled_textarea") }
+            }
+          JS
 
           expect(result).to eq(
             "a" => @session.driver.find_css("#empty_input").first,
@@ -1531,7 +1536,9 @@ def create_screenshot(file, *args)
         it "will timeout" do
           @session.using_wait_time(1) do
             expect do
-              @session.driver.evaluate_async_script("var callback=arguments[0]; setTimeout(function(){callback(true)}, 4000)")
+              @session.driver.evaluate_async_script <<~JS
+                var callback=arguments[0]; setTimeout(function(){callback(true)}, 4000)
+              JS
             end.to raise_error Ferrum::ScriptTimeoutError
           end
         end

spec/features/session_spec.rb

@@ -821,7 +821,7 @@
         @session.visit "/"
 
         expect do
-          @session.within_frame("omg") {}
+          @session.within_frame("omg", &:itself)
         end.to(raise_error do |e|
           expect(e).to be_a(Capybara::ElementNotFound)
         end)
@@ -917,7 +917,12 @@
     context "modals" do
       it "accepts by default with warning" do
         @session.visit "/cuprite/with_js"
-        expect(@session.driver.browser.page).to receive(:warn).with("Modal window with text `{T}ext \\w|th [reg.exp] (chara©+er$)?` has been opened, but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` | `dismiss_confirm` | `accept_alert`), accepting by default")
+        expect(@session.driver.browser.page)
+          .to receive(:warn).with(
+            "Modal window with text `{T}ext \\w|th [reg.exp] (chara©+er$)?` has been opened, "\
+            "but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` "\
+            "| `dismiss_confirm` | `accept_alert`), accepting by default"
+          )
 
         expect { @session.click_link("Open for match") }.not_to raise_error
 

spec/spec_helper.rb

@@ -94,17 +94,17 @@ module TestSessions
 
     if ENV["CI"] && example.exception
       session = @session || TestSessions::Cuprite
-      save_exception_aftifacts(session.driver.browser, example.metadata)
+      save_exception_artifacts(session.driver.browser, example.metadata)
     end
   end
 
   Capybara::SpecHelper.configure(config)
 
-  def save_exception_aftifacts(browser, meta)
+  def save_exception_artifacts(browser, meta)
     time_now = Time.now
     filename = File.basename(meta[:file_path])
     line_number = meta[:line_number]
-    timestamp = "#{time_now.strftime('%Y-%m-%d-%H-%M-%S.')}#{'%03d' % (time_now.usec / 1000).to_i}"
+    timestamp = time_now.strftime("%Y-%m-%d-%H-%M-%S.") + format("%03d", (time_now.usec / 1000).to_i)
 
     save_exception_log(browser, filename, line_number, timestamp)
     save_exception_screenshot(browser, filename, line_number, timestamp)