Merge branch 'trunk' into py_webdriver_wait_custom_msg

Author: cgoldberg

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b5/linux-x86_64/en-US/firefox-139.0b5.tar.xz",
-        sha256 = "5ff7ed52bf658b78b80595629096f12a16951ebb702da9a0dce9b02b14421976",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b6/linux-x86_64/en-US/firefox-139.0b6.tar.xz",
+        sha256 = "39f087356b885fb4bbfebe315d09bac3979798a7e0bff0b7c788707c0c7d4d11",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b5/mac/en-US/Firefox%20139.0b5.dmg",
-        sha256 = "c0c4cb22c32298f4d3199162326937a13700a9330b8f9840bf21ada5fcc41638",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b6/mac/en-US/Firefox%20139.0b6.dmg",
+        sha256 = "d2fa2ef24f80cbadab7dfb31639f76d8a530acd1653bb8a437ef128937ce1019",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/7a2f13f4-e241-4582-94b2-6c56bef6b23d/MicrosoftEdge-136.0.3240.50.pkg",
-        sha256 = "3500c3a7f548e222344c3c110e0a0b190a033adb10d020ce58b8c64a384ad8b6",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/0d424762-5771-4a00-ada6-d1a3fb2e2054/MicrosoftEdge-136.0.3240.64.pkg",
+        sha256 = "483324afe4db695c9497822e3e220065379d92077b8f29abb1e8d8f6d045909c",
         move = {
-            "MicrosoftEdge-136.0.3240.50.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-136.0.3240.64.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_136.0.3240.50-1_amd64.deb",
-        sha256 = "19d27dddf6d4a46e1e03b3d0fa1eb4af0d5870f12d3816e0431b983331f947e9",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_136.0.3240.64-1_amd64.deb",
+        sha256 = "cf2a2ea4d76d5cae66bc8e68ca9f40255ad6c1894c28e55a6813a70ce8c73b4a",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_linux64.zip",
-        sha256 = "c987f3334ab00366d3afea79bddb510367a3b81ead88ff808980d3ed6b86e4aa",
+        url = "https://msedgedriver.azureedge.net/136.0.3240.64/edgedriver_linux64.zip",
+        sha256 = "0e9f65bb5fd87f80d0aca4d5330e0aab37057a8c233ba6bc46e5f43b9640103c",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_mac64.zip",
-        sha256 = "9c592695119986af76bd0182bc355716e29844dd97052f77865f55fffbf6db3d",
+        url = "https://msedgedriver.azureedge.net/136.0.3240.64/edgedriver_mac64.zip",
+        sha256 = "729731958bfeee999006572973c8eee6d4bd402e34c5b410fb29bfbaeeafb8bd",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

py/selenium/webdriver/common/bidi/log.py

@@ -68,3 +68,12 @@ def from_json(cls, json):
             stacktrace=json["stackTrace"],
             type_=json["type"],
         )
+
+
+class LogLevel:
+    """Represents log level."""
+
+    DEBUG = "debug"
+    INFO = "info"
+    WARN = "warn"
+    ERROR = "error"

py/test/selenium/webdriver/common/bidi_script_tests.py

@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from selenium.webdriver.common.bidi.log import LogLevel
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -31,7 +32,7 @@ def test_logs_console_messages(driver, pages):
     WebDriverWait(driver, 5).until(lambda _: log_entries)
 
     log_entry = log_entries[0]
-    assert log_entry.level == "info"
+    assert log_entry.level == LogLevel.INFO
     assert log_entry.method == "log"
     assert log_entry.text == "Hello, world!"
     assert log_entry.type_ == "console"
@@ -55,7 +56,7 @@ def log_error(entry):
     assert len(log_entries) == 1
 
     log_entry = log_entries[0]
-    assert log_entry.level == "error"
+    assert log_entry.level == LogLevel.ERROR
     assert log_entry.method == "error"
     assert log_entry.text == "I am console error"
     assert log_entry.type_ == "console"
@@ -105,7 +106,7 @@ def test_javascript_error_messages(driver, pages):
 
     log_entry = log_entries[0]
     assert log_entry.text == "Error: Not working"
-    assert log_entry.level == "error"
+    assert log_entry.level == LogLevel.ERROR
     assert log_entry.type_ == "javascript"
 
 

rb/lib/selenium/webdriver/firefox/service.rb

@@ -28,9 +28,9 @@ class Service < WebDriver::Service
 
         def initialize(path: nil, port: nil, log: nil, args: nil)
           args ||= []
-          unless args.any? { |arg| arg.include?('--connect-existing') }
+          unless args.any? { |arg| arg.include?('--connect-existing') || arg.include?('--websocket-port') }
             args << '--websocket-port'
-            args << WebDriver::PortProber.above(9222).to_s
+            args << '0'
           end
           super
         end

rb/spec/integration/selenium/webdriver/firefox/service_spec.rb

@@ -39,21 +39,6 @@ module Firefox
         it 'can be started outside driver' do
           expect(service_manager.uri).to be_a(URI)
         end
-
-        context 'with BiDi enabled', exclusive: {bidi: true, reason: 'only executed when bidi is enabled'} do
-          it 'ensures two service instances use different websocket port' do
-            service1 = described_class.new
-            service2 = described_class.new
-
-            ws_index1 = service1.args.index('--websocket-port')
-            ws_index2 = service2.args.index('--websocket-port')
-
-            port1 = service1.args[ws_index1 + 1].to_i
-            port2 = service2.args[ws_index2 + 1].to_i
-
-            expect(port1).not_to eq(port2)
-          end
-        end
       end
     end # Firefox
   end # WebDriver

rb/spec/unit/selenium/webdriver/firefox/service_spec.rb

@@ -77,11 +77,11 @@ module Firefox
             expect(service.extra_args).to include(*%w[--foo --bar])
           end
 
-          it 'there is a random port for websocket' do
+          it 'there is a zero port for websocket' do
             service = described_class.new
             ws_index = service.extra_args.index('--websocket-port')
             port = service.extra_args[ws_index + 1].to_i
-            expect(port).to be_positive
+            expect(port).to be_zero
           end
 
           context 'with connect existing' do
@@ -91,6 +91,14 @@ module Firefox
               expect(service.extra_args).to eq(['--connect-existing'])
             end
           end
+
+          context 'with websocket port' do
+            it 'does not add websocket-port' do
+              service = described_class.new(args: ['--websocket-port=1234'])
+              expect(service.extra_args).not_to include('--websocket-port=0')
+              expect(service.extra_args).to eq(['--websocket-port=1234'])
+            end
+          end
         end
 
         context 'when initializing driver' do