From 02187c6a25ca110f4339e1c99ccc9513e645903d Mon Sep 17 00:00:00 2001
From: aguspe <agustin.pe94@gmail.com>
Date: Fri, 15 Nov 2024 23:52:21 +0100
Subject: [PATCH 1/2] Deprecate CDP for firefox

---
 .../webdriver/common/driver_extensions/has_devtools.rb     | 7 +++++++
 .../webdriver/common/driver_extensions/has_log_events.rb   | 7 +++++++
 .../common/driver_extensions/has_network_interception.rb   | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
index 29aab394dfa6a..b9dd73b2c321a 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
@@ -28,6 +28,13 @@ module HasDevTools
         #
 
         def devtools
+          if browser == :firefox
+            WebDriver.logger.deprecate(
+              'Driver#devtools on Firefox',
+              'the new BiDi implementation',
+              id: :devtools
+            )
+          end
           @devtools ||= begin
             require 'selenium/devtools'
             Selenium::DevTools.version ||= devtools_version
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
index 1965466633f08..c1fbd3def3c00 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
@@ -57,6 +57,13 @@ module HasLogEvents
         #
 
         def on_log_event(kind, &block)
+          if browser == :firefox
+            WebDriver.logger.deprecate(
+              'Driver#on_log_event on Firefox',
+              'the new BiDi implementation',
+              id: :on_log_event
+            )
+          end
           raise Error::WebDriverError, "Don't know how to handle #{kind} events" unless KINDS.include?(kind)
 
           enabled = log_listeners[kind].any?
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
index 3339426157d91..f48b4e9632b9f 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
@@ -60,6 +60,13 @@ module HasNetworkInterception
         #
 
         def intercept(&)
+          if browser == :firefox
+            WebDriver.logger.deprecate(
+              'Driver#intercept on Firefox',
+              'the new BiDi implementation',
+              id: :intercept
+            )
+          end
           @interceptor ||= DevTools::NetworkInterceptor.new(devtools)
           @interceptor.intercept(&)
         end

From cf16ad73743020dd9d7ad0a4fdb608ac457a3f3c Mon Sep 17 00:00:00 2001
From: aguspe <agustin.pe94@gmail.com>
Date: Thu, 21 Nov 2024 15:20:45 +0100
Subject: [PATCH 2/2] Make the deprecation message less generic

---
 .../webdriver/common/driver_extensions/has_devtools.rb     | 7 -------
 .../webdriver/common/driver_extensions/has_log_events.rb   | 2 +-
 .../common/driver_extensions/has_network_interception.rb   | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
index b9dd73b2c321a..29aab394dfa6a 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
@@ -28,13 +28,6 @@ module HasDevTools
         #
 
         def devtools
-          if browser == :firefox
-            WebDriver.logger.deprecate(
-              'Driver#devtools on Firefox',
-              'the new BiDi implementation',
-              id: :devtools
-            )
-          end
           @devtools ||= begin
             require 'selenium/devtools'
             Selenium::DevTools.version ||= devtools_version
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
index c1fbd3def3c00..8acadbe0b8519 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_log_events.rb
@@ -60,7 +60,7 @@ def on_log_event(kind, &block)
           if browser == :firefox
             WebDriver.logger.deprecate(
               'Driver#on_log_event on Firefox',
-              'the new BiDi implementation',
+              'the script.add_console_message_handler or the script.add_javascript_error_handler methods',
               id: :on_log_event
             )
           end
diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
index f48b4e9632b9f..54abcecba87c7 100644
--- a/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
+++ b/rb/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb
@@ -63,7 +63,7 @@ def intercept(&)
           if browser == :firefox
             WebDriver.logger.deprecate(
               'Driver#intercept on Firefox',
-              'the new BiDi implementation',
+              'the new bidi.network.add_intercept method',
               id: :intercept
             )
           end