Fix rubocop warnings

route · route · commit e10ed1dfb940 · 2021-11-04T10:42:06.000+03:00
diff --git a/lib/ferrum/browser/process.rb b/lib/ferrum/browser/process.rb
@@ -47,6 +47,7 @@ def self.process_killer(pid)
             end
           end
         rescue Errno::ESRCH, Errno::ECHILD
+          # nop
         end
       end
 
diff --git a/lib/ferrum/context.rb b/lib/ferrum/context.rb
@@ -76,7 +76,7 @@ def dispose
       @contexts.dispose(@id)
     end
 
-    def has_target?(target_id)
+    def target?(target_id)
       !!@targets[target_id]
     end
 
diff --git a/lib/ferrum/contexts.rb b/lib/ferrum/contexts.rb
@@ -19,7 +19,7 @@ def default_context
 
     def find_by(target_id:)
       context = nil
-      @contexts.each_value { |c| context = c if c.has_target?(target_id) }
+      @contexts.each_value { |c| context = c if c.target?(target_id) }
       context
     end
 
@@ -68,15 +68,13 @@ def subscribe
       end
 
       @browser.client.on("Target.targetDestroyed") do |params|
-        if context = find_by(target_id: params["targetId"])
-          context.delete_target(params["targetId"])
-        end
+        context = find_by(target_id: params["targetId"])
+        context&.delete_target(params["targetId"])
       end
 
       @browser.client.on("Target.targetCrashed") do |params|
-        if context = find_by(target_id: params["targetId"])
-          context.delete_target(params["targetId"])
-        end
+        context = find_by(target_id: params["targetId"])
+        context&.delete_target(params["targetId"])
       end
     end
 
diff --git a/lib/ferrum/frame.rb b/lib/ferrum/frame.rb
@@ -73,7 +73,12 @@ def reset_execution_id
     end
 
     def inspect
-      %(#<#{self.class} @id=#{@id.inspect} @parent_id=#{@parent_id.inspect} @name=#{@name.inspect} @state=#{@state.inspect} @execution_id=#{@execution_id.inspect}>)
+      "#<#{self.class} "\
+        "@id=#{@id.inspect} "\
+        "@parent_id=#{@parent_id.inspect} "\
+        "@name=#{@name.inspect} "\
+        "@state=#{@state.inspect} "\
+        "@execution_id=#{@execution_id.inspect}>"
     end
   end
 end
diff --git a/lib/ferrum/page.rb b/lib/ferrum/page.rb
@@ -124,14 +124,10 @@ def position
       @browser.command("Browser.getWindowBounds", windowId: window_id).fetch("bounds").values_at("left", "top")
     end
 
-    def position=(*args)
-      if args.size == 1
-        left = args[0][:left]
-        top = args[0][:top]
-      else
-        raise "Use like: browser.position = { left: 1, right: 2}"
-      end
-      @browser.command("Browser.setWindowBounds", windowId: window_id, bounds: { left: left, top: top })
+    def position=(options)
+      @browser.command("Browser.setWindowBounds",
+                       windowId: window_id,
+                       bounds: { left: options[:left], top: options[:top] })
     end
 
     def refresh
@@ -279,7 +275,7 @@ def prepare_page
 
       response = command("Page.getNavigationHistory")
       if response.dig("entries", 0, "transitionType") != "typed"
-        # If we create page by clicking links, submiting forms and so on it
+        # If we create page by clicking links, submitting forms and so on it
         # opens a new window for which `frameStoppedLoading` event never
         # occurs and thus search for nodes cannot be completed. Here we check
         # the history and if the transitionType for example `link` then
@@ -304,13 +300,15 @@ def inject_extensions
     def history_navigate(delta:)
       history = command("Page.getNavigationHistory")
       index, entries = history.values_at("currentIndex", "entries")
+      entry = entries[index + delta]
 
-      if entry = entries[index + delta]
-        # Potential wait because of network event
-        command("Page.navigateToHistoryEntry", wait: Mouse::CLICK_WAIT,
-                                               slowmoable: true,
-                                               entryId: entry["id"])
-      end
+      return unless entry
+
+      # Potential wait because of network event
+      command("Page.navigateToHistoryEntry",
+              wait: Mouse::CLICK_WAIT,
+              slowmoable: true,
+              entryId: entry["id"])
     end
 
     def combine_url!(url_or_path)
diff --git a/spec/browser_spec.rb b/spec/browser_spec.rb
@@ -63,8 +63,8 @@ module Ferrum
 
       expect do
         Browser.new(browser_path: path)
-      end.to raise_error(Ferrum::ProcessTimeoutError) do |ex|
-        expect(ex.output).to include "Broken Chrome error message"
+      end.to raise_error(Ferrum::ProcessTimeoutError) do |e|
+        expect(e.output).to include "Broken Chrome error message"
       end
     end
 
diff --git a/spec/dialog_spec.rb b/spec/dialog_spec.rb
@@ -38,8 +38,6 @@ module Ferrum
         browser.on(:dialog) do |dialog, _index, _total|
           if dialog.match?("Are you sure?")
             dialog.accept
-          elsif dialog.match?("Are you really sure?")
-            dialog.dismiss
           else
             dialog.dismiss
           end
diff --git a/spec/frame_spec.rb b/spec/frame_spec.rb
@@ -184,9 +184,9 @@ module Ferrum
         browser.go_to("/ferrum/frames")
         expect(browser.doctype).to eq("<!DOCTYPE html>")
 
-        doctype_40 = %(<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">)
-        browser.set_content(%(#{doctype_40}<html><head></head><body>Voila!</body></html>))
-        expect(browser.doctype).to eq(doctype_40)
+        doctype40 = %(<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">)
+        browser.set_content(%(#{doctype40}<html><head></head><body>Voila!</body></html>))
+        expect(browser.doctype).to eq(doctype40)
 
         browser.set_content("")
         expect(browser.doctype).to be_nil
diff --git a/spec/network/auth_request_spec.rb b/spec/network/auth_request_spec.rb
@@ -3,6 +3,7 @@
 module Ferrum
   class Network
     describe AuthRequest do
+      skip
     end
   end
 end
diff --git a/spec/network/intercepted_request_spec.rb b/spec/network/intercepted_request_spec.rb
@@ -3,6 +3,7 @@
 module Ferrum
   class Network
     describe InterceptedRequest do
+      skip
     end
   end
 end
diff --git a/spec/network/request_spec.rb b/spec/network/request_spec.rb
@@ -3,6 +3,7 @@
 module Ferrum
   class Network
     describe Request do
+      skip
     end
   end
 end
diff --git a/spec/network_spec.rb b/spec/network_spec.rb
@@ -321,7 +321,8 @@ module Ferrum
         expect do
           network.authorize(user: "login", password: "pass")
         end.to raise_exception(ArgumentError,
-                               "Block is missing, call `authorize(...) { |r| r.continue } or subscribe to `on(:request)` events before calling it")
+                               "Block is missing, call `authorize(...) { |r| r.continue }"\
+                               " or subscribe to `on(:request)` events before calling it")
       end
 
       it "raises no error when authorize is with block" do
diff --git a/spec/screenshot_spec.rb b/spec/screenshot_spec.rb
@@ -233,9 +233,9 @@ def create_screenshot(**options)
         context "when encoding is base64" do
           let(:file) { "#{PROJECT_ROOT}/spec/tmp/screenshot.#{format}" }
 
-          def create_screenshot(path: file, **options)
+          def create_screenshot(path:, **options)
             image = browser.screenshot(format: format, encoding: :base64, **options)
-            File.open(file, "wb") { |f| f.write Base64.decode64(image) }
+            File.open(path, "wb") { |f| f.write Base64.decode64(image) }
           end
 
           it "defaults to base64 when path isn't set" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,7 +14,8 @@
 ENV["FERRUM_NEW_WINDOW_WAIT"] ||= "0.8" if ENV["CI"]
 
 puts ""
-puts `#{Ferrum::Browser::Command.build({ window_size: [], ignore_default_browser_options: true }, nil).to_a.first} --version`
+command = Ferrum::Browser::Command.build({ window_size: [], ignore_default_browser_options: true }, nil)
+puts `#{command.to_a.first} --version`
 puts ""
 
 RSpec.configure do |config|
diff --git a/spec/support/application.rb b/spec/support/application.rb
@@ -11,9 +11,10 @@ class Application < Sinatra::Base
     class TestAppError < Exception; end # rubocop:disable Lint/InheritException
 
     class TestAppOtherError < Exception # rubocop:disable Lint/InheritException
-      def initialize(string1, msg)
-        @something = string1
-        @message = msg
+      def initialize(something, message)
+        super(something)
+        @something = something
+        @message = message
       end
     end
 
diff --git a/spec/support/server.rb b/spec/support/server.rb
@@ -50,15 +50,15 @@ def call(env)
       end
     end
 
-    attr_reader :app, :host, :port
+    class << self
+      attr_accessor :server
 
-    def self.boot(**options)
-      new(**options).tap(&:boot!)
+      def boot(**options)
+        new(**options).tap(&:boot!)
+      end
     end
 
-    def self.server
-      @@server
-    end
+    attr_reader :app, :host, :port
 
     def initialize(app: nil, host: "127.0.0.1", port: nil)
       @host = host
@@ -81,18 +81,18 @@ def wait_for_pending_requests
     end
 
     def boot!
-      unless responsive?
-        start = Ferrum.monotonic_time
-        @server_thread = Thread.new { run }
+      return if responsive?
 
-        until responsive?
-          raise "Rack application timed out during boot" if Ferrum.timeout?(start, KILL_TIMEOUT)
+      start = Ferrum.monotonic_time
+      @server_thread = Thread.new { run }
 
-          @server_thread.join(0.1)
-        end
+      until responsive?
+        raise "Rack application timed out during boot" if Ferrum.timeout?(start, KILL_TIMEOUT)
 
-        @@server = self
+        @server_thread.join(0.1)
       end
+
+      self.class.server = self
     end
 
     private
@@ -134,7 +134,7 @@ def find_available_port(host)
       server = TCPServer.new(host, 0)
       server.addr[1]
     ensure
-      server&.close
+      server.close
     end
   end
 end

-Original file line number
+Diff line change
             end
           end
         rescue Errno::ESRCH, Errno::ECHILD
 +          # nop
         end
       end