[rb] add IDs to logging messages

quehanwei · Nov 29, 2019 · 61ccd71 · 61ccd71
1 parent f5d2163
commit 61ccd71
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/rb/lib/selenium/webdriver/chrome.rb b/rb/lib/selenium/webdriver/chrome.rb
@@ -30,13 +30,15 @@ module Chrome
 
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome#driver_path=',
-                                   'Selenium::WebDriver::Chrome::Service#driver_path='
+                                   'Selenium::WebDriver::Chrome::Service#driver_path=',
+                                   id: :driver_path
         Selenium::WebDriver::Chrome::Service.driver_path = path
       end
 
       def self.driver_path
         WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome#driver_path',
-                                   'Selenium::WebDriver::Chrome::Service#driver_path'
+                                   'Selenium::WebDriver::Chrome::Service#driver_path',
+                                   id: :driver_path
         Selenium::WebDriver::Chrome::Service.driver_path
       end
 

diff --git a/rb/lib/selenium/webdriver/common/driver.rb b/rb/lib/selenium/webdriver/common/driver.rb
@@ -318,7 +318,8 @@ def service_url(opts)
         %i[driver_opts driver_path port].each do |key|
           next unless opts.key? key
 
-          WebDriver.logger.deprecate(":#{key}", ':service with an instance of Selenium::WebDriver::Service')
+          WebDriver.logger.deprecate(":#{key}", ':service with an instance of Selenium::WebDriver::Service',
+                                     id: :service)
         end
         @service ||= Service.send(browser,
                                   args: opts.delete(:driver_opts),

diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb b/rb/lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb
@@ -35,7 +35,8 @@ def save_screenshot(png_path)
           extension = File.extname(png_path).downcase
           if extension != '.png'
             WebDriver.logger.warn "name used for saved screenshot does not match file type. "\
-                                  "It should end with .png extension"
+                                  "It should end with .png extension",
+                                  id: :screenshot
           end
           File.open(png_path, 'wb') { |f| f << screenshot_as(:png) }
         end

diff --git a/rb/lib/selenium/webdriver/common/options.rb b/rb/lib/selenium/webdriver/common/options.rb
@@ -25,7 +25,8 @@ class Options
       def initialize(options: nil, **opts)
         @options = if options
                      WebDriver.logger.deprecate(":options as keyword for initializing #{self.class}",
-                                                "custom values directly in #new constructor")
+                                                "custom values directly in #new constructor",
+                                                id: :options_options)
                      opts.merge(options)
                    else
                      opts

diff --git a/rb/lib/selenium/webdriver/edge.rb b/rb/lib/selenium/webdriver/edge.rb
@@ -28,13 +28,15 @@ module EdgeHtml
 
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path=',
-                                   'Selenium::WebDriver::Edge::Service#driver_path='
+                                   'Selenium::WebDriver::Edge::Service#driver_path=',
+                                   id: :driver_path
         Selenium::WebDriver::Edge::Service.driver_path = path
       end
 
       def self.driver_path
         WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path',
-                                   'Selenium::WebDriver::Edge::Service#driver_path'
+                                   'Selenium::WebDriver::Edge::Service#driver_path',
+                                   id: :driver_path
         Selenium::WebDriver::Edge::Service.driver_path
       end
     end # EdgeHtml

diff --git a/rb/lib/selenium/webdriver/firefox.rb b/rb/lib/selenium/webdriver/firefox.rb
@@ -40,13 +40,15 @@ module Firefox
 
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::Firefox#driver_path=',
-                                   'Selenium::WebDriver::Firefox::Service#driver_path='
+                                   'Selenium::WebDriver::Firefox::Service#driver_path=',
+                                   id: :driver_path
         Selenium::WebDriver::Firefox::Service.driver_path = path
       end
 
       def self.driver_path
         WebDriver.logger.deprecate 'Selenium::WebDriver::Firefox#driver_path',
-                                   'Selenium::WebDriver::Firefox::Service#driver_path'
+                                   'Selenium::WebDriver::Firefox::Service#driver_path',
+                                   id: :driver_path
         Selenium::WebDriver::Firefox::Service.driver_path
       end
 

diff --git a/rb/lib/selenium/webdriver/ie.rb b/rb/lib/selenium/webdriver/ie.rb
@@ -26,13 +26,15 @@ module IE
 
       def self.driver_path=(path)
         WebDriver.logger.deprecate 'Selenium::WebDriver::IE#driver_path=',
-                                   'Selenium::WebDriver::IE::Service#driver_path='
+                                   'Selenium::WebDriver::IE::Service#driver_path=',
+                                   id: :driver_path
         Selenium::WebDriver::IE::Service.driver_path = path
       end
 
       def self.driver_path
         WebDriver.logger.deprecate 'Selenium::WebDriver::IE#driver_path',
-                                   'Selenium::WebDriver::IE::Service#driver_path'
+                                   'Selenium::WebDriver::IE::Service#driver_path',
+                                   id: :driver_path
         Selenium::WebDriver::IE::Service.driver_path
       end
     end # IE

diff --git a/rb/lib/selenium/webdriver/safari.rb b/rb/lib/selenium/webdriver/safari.rb
@@ -49,13 +49,15 @@ def path
 
         def driver_path=(path)
           WebDriver.logger.deprecate 'Selenium::WebDriver::Safari#driver_path=',
-                                     'Selenium::WebDriver::Safari::Service#driver_path='
+                                     'Selenium::WebDriver::Safari::Service#driver_path=',
+                                     id: :driver_path
           Selenium::WebDriver::Safari::Service.driver_path = path
         end
 
         def driver_path
           WebDriver.logger.deprecate 'Selenium::WebDriver::Safari#driver_path',
-                                     'Selenium::WebDriver::Safari::Service#driver_path'
+                                     'Selenium::WebDriver::Safari::Service#driver_path',
+                                     id: :driver_path
           Selenium::WebDriver::Safari::Service.driver_path
         end
       end