[rb] can toggle deprecation notice based on Remote::Driver instead of passing in the class

titusfortner · titusfortner · commit ee4b910cd3c1 · 2023-01-06T13:22:05.000-06:00
diff --git a/rb/lib/selenium/webdriver/chrome/driver.rb b/rb/lib/selenium/webdriver/chrome/driver.rb
@@ -53,7 +53,7 @@ def process_options(options, capabilities)
             options = Options.new
           end
 
-          super(options, capabilities, Options)
+          super(options, capabilities)
         end
       end # Driver
     end # Chrome
diff --git a/rb/lib/selenium/webdriver/common/driver.rb b/rb/lib/selenium/webdriver/common/driver.rb
@@ -314,19 +314,19 @@ def create_bridge(caps:, url:, http_client: nil)
         end
       end
 
-      def process_options(options, capabilities, klass = nil)
+      def process_options(options, capabilities)
         if options && capabilities
           msg = "Don't use both :options and :capabilities when initializing #{self.class}, prefer :options"
           raise ArgumentError, msg
         end
 
-        options ? options.as_json : deprecate_capabilities(capabilities, klass)
+        options ? options.as_json : deprecate_capabilities(capabilities)
       end
 
-      def deprecate_capabilities(capabilities, klass)
-        if klass
+      def deprecate_capabilities(capabilities)
+        unless is_a?(Remote::Driver)
           WebDriver.logger.deprecate("The :capabilities parameter for #{self.class}",
-                                     ":options argument with an instance of #{klass}",
+                                     ":options argument with an instance of #{self.class}",
                                      id: :capabilities)
         end
         generate_capabilities(capabilities)
diff --git a/rb/lib/selenium/webdriver/edge/driver.rb b/rb/lib/selenium/webdriver/edge/driver.rb
@@ -53,7 +53,7 @@ def process_options(options, capabilities)
             options = Options.new
           end
 
-          super(options, capabilities, Options)
+          super(options, capabilities)
         end
       end # Driver
     end # Edge
diff --git a/rb/lib/selenium/webdriver/firefox/driver.rb b/rb/lib/selenium/webdriver/firefox/driver.rb
@@ -72,7 +72,7 @@ def process_options(options, capabilities)
             options = Options.new
           end
 
-          super(options, capabilities, Options)
+          super(options, capabilities)
         end
       end # Driver
     end # Firefox
diff --git a/rb/lib/selenium/webdriver/ie/driver.rb b/rb/lib/selenium/webdriver/ie/driver.rb
@@ -50,7 +50,7 @@ def process_options(options, capabilities)
             options = Options.new
           end
 
-          super(options, capabilities, Options)
+          super(options, capabilities)
         end
       end # Driver
     end # IE
diff --git a/rb/lib/selenium/webdriver/safari/driver.rb b/rb/lib/selenium/webdriver/safari/driver.rb
@@ -51,7 +51,7 @@ def process_options(options, capabilities)
             options = Options.new
           end
 
-          super(options, capabilities, Options)
+          super(options, capabilities)
         end
       end # Driver
     end # Safari
