[rb] update to CDP support to v86, v87 & v88

SeleniumHQ · Feb 10, 2021 · f0c2dea · f0c2dea
1 parent 6111d22
commit f0c2dea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 34 deletions.
diff --git a/rb/build.desc b/rb/build.desc
@@ -288,10 +288,9 @@ ruby_library(name = "devtools",
   ],
   deps = [
     ":common",
-    ":cdp-v84",
-    ":cdp-v85",
     ":cdp-v86",
     ":cdp-v87",
+    ":cdp-v88",
   ],
   resources = [
     { "../javascript/cdp-support/mutation-listener.js": "rb/lib/selenium/webdriver/atoms/mutationListener.js" }
@@ -317,67 +316,51 @@ ruby_test(name = "unit",
   ]
 )
 
-ruby_class_call(name = "cdp-v84",
-  klass = "Selenium::WebDriver::Support::CDPClientGenerator",
-  require = "rb/lib/selenium/webdriver/support/cdp_client_generator",
-  output_dir = "rb/lib/selenium/webdriver/devtools/v84",
-  version = "v84",
-  srcs = [
-    "lib/selenium/webdriver/support/cdp",
-    "lib/selenium/webdriver/support/cdp/**/*",
-    "lib/selenium/webdriver/support/cdp_client_generator.rb"
-  ],
-  resources = [
-    { "//common/devtools/chromium/v84:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
-    { "//common/devtools/chromium/v84:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
-  ]
-)
-
-ruby_class_call(name = "cdp-v85",
+ruby_class_call(name = "cdp-v86",
   klass = "Selenium::WebDriver::Support::CDPClientGenerator",
   require = "rb/lib/selenium/webdriver/support/cdp_client_generator",
-  output_dir = "rb/lib/selenium/webdriver/devtools/v85",
-  version = "v85",
+  output_dir = "rb/lib/selenium/webdriver/devtools/v86",
+  version = "v86",
   srcs = [
     "lib/selenium/webdriver/support/cdp",
     "lib/selenium/webdriver/support/cdp/**/*",
     "lib/selenium/webdriver/support/cdp_client_generator.rb"
   ],
   resources = [
-    { "//common/devtools/chromium/v85:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
-    { "//common/devtools/chromium/v85:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
+    { "//common/devtools/chromium/v86:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
+    { "//common/devtools/chromium/v86:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
   ]
 )
 
-ruby_class_call(name = "cdp-v86",
+ruby_class_call(name = "cdp-v87",
   klass = "Selenium::WebDriver::Support::CDPClientGenerator",
   require = "rb/lib/selenium/webdriver/support/cdp_client_generator",
-  output_dir = "rb/lib/selenium/webdriver/devtools/v86",
-  version = "v86",
+  output_dir = "rb/lib/selenium/webdriver/devtools/v87",
+  version = "v87",
   srcs = [
     "lib/selenium/webdriver/support/cdp",
     "lib/selenium/webdriver/support/cdp/**/*",
     "lib/selenium/webdriver/support/cdp_client_generator.rb"
   ],
   resources = [
-    { "//common/devtools/chromium/v86:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
-    { "//common/devtools/chromium/v86:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
+    { "//common/devtools/chromium/v87:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
+    { "//common/devtools/chromium/v87:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
   ]
 )
 
-ruby_class_call(name = "cdp-v87",
+ruby_class_call(name = "cdp-v88",
   klass = "Selenium::WebDriver::Support::CDPClientGenerator",
   require = "rb/lib/selenium/webdriver/support/cdp_client_generator",
-  output_dir = "rb/lib/selenium/webdriver/devtools/v87",
-  version = "v87",
+  output_dir = "rb/lib/selenium/webdriver/devtools/v88",
+  version = "v88",
   srcs = [
     "lib/selenium/webdriver/support/cdp",
     "lib/selenium/webdriver/support/cdp/**/*",
     "lib/selenium/webdriver/support/cdp_client_generator.rb"
   ],
   resources = [
-    { "//common/devtools/chromium/v87:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
-    { "//common/devtools/chromium/v87:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
+    { "//common/devtools/chromium/v88:browser_protocol": "rb/lib/selenium/webdriver/support/cdp/browser_protocol.json" },
+    { "//common/devtools/chromium/v88:js_protocol": "rb/lib/selenium/webdriver/support/cdp/js_protocol.json" }
   ]
 )
 

diff --git a/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb b/rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb
@@ -30,6 +30,7 @@ module HasDevTools
 
         def devtools
           version = Integer(capabilities.browser_version.split('.').first)
+          WebDriver.logger.info "Using devtools version: #{version}"
           @devtools ||= DevTools.new(url: debugger_address, version: version)
         end
 

diff --git a/rb/lib/selenium/webdriver/devtools.rb b/rb/lib/selenium/webdriver/devtools.rb
@@ -24,7 +24,7 @@ class DevTools
       autoload :ExceptionEvent, 'selenium/webdriver/devtools/exception_event'
       autoload :MutationEvent, 'selenium/webdriver/devtools/mutation_event'
 
-      SUPPORTED_VERSIONS = [84, 85, 86, 87].freeze
+      SUPPORTED_VERSIONS = [85, 86, 87, 88].freeze
 
       def initialize(url:, version:)
         @messages = []