add tests

Author: KazuCocoa

lib/appium_lib_core/common/base/bidi_bridge.rb

@@ -45,8 +45,13 @@ class BiDiBridge < ::Appium::Core::Base::Bridge
         #
         def create_session(capabilities)
           super
-          socket_url = @capabilities[:web_socket_url]
-          @bidi = ::Selenium::WebDriver::BiDi.new(url: socket_url)
+
+          unless @capabilities.nil?
+            socket_url = @capabilities[:web_socket_url]
+            @bidi = ::Selenium::WebDriver::BiDi.new(url: socket_url) if socket_url
+          end
+
+          @capabilities
         end
 
         def get(url)

lib/appium_lib_core/common/base/bridge.rb

@@ -116,9 +116,6 @@ def create_session(capabilities)
           raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload' unless @session_id
 
           @capabilities = json_create(response['capabilities'])
-
-          socket_url = @capabilities[:web_socket_url]
-          @bidi = ::Selenium::WebDriver::BiDi.new(url: socket_url) if socket_url
         end
 
         # Append +appium:+ prefix for Appium following W3C spec

lib/appium_lib_core/common/base/driver.rb

@@ -57,6 +57,8 @@ def initialize(bridge: nil, listener: nil, **opts) # rubocop:disable Lint/Missin
           # internal use
           @has_bidi = false
 
+          ::Selenium::WebDriver::Remote::Bridge.element_class = ::Appium::Core::Element
+
           bridge ||= create_bridge(**opts)
           add_extensions(bridge.browser)
           @bridge = listener ? ::Appium::Support::EventFiringBridge.new(bridge, listener, **original_opts) : bridge
@@ -80,14 +82,9 @@ def create_bridge(**opts)
 
           raise ::Appium::Core::Error::ArgumentError, "Unable to create a driver with parameters: #{opts}" unless opts.empty?
 
-          if capabilities['webSocketUrl']
-            @has_bidi = true
-            ::Selenium::WebDriver::Remote::BiDiBridge.element_class = ::Appium::Core::Element
-            bridge = ::Appium::Core::Base::BiDiBridge.new(**bridge_opts)
-          else
-            ::Selenium::WebDriver::Remote::Bridge.element_class = ::Appium::Core::Element
-            bridge = ::Appium::Core::Base::Bridge.new(**bridge_opts)
-          end
+          @has_bidi = capabilities && capabilities['webSocketUrl']
+          bridge_clzz = @has_bidi ? ::Appium::Core::Base::BiDiBridge : ::Appium::Core::Base::Bridge
+          bridge = bridge_clzz.new(**bridge_opts)
 
           if session_id.nil?
             bridge.create_session(capabilities)

test/unit/driver_test.rb

@@ -700,6 +700,40 @@ def test_listener_with_custom_listener_elements
       assert_equal ::Appium::Core::Element, c_el.first.class
     end
 
+    def test_bidi_bridge
+      android_mock_create_session_w3c_direct = lambda do |core|
+        response = {
+          value: {
+            sessionId: '1234567890',
+            capabilities: {
+              platformName: :android,
+              automationName: ENV['APPIUM_DRIVER'] || 'uiautomator2',
+              deviceName: 'Android Emulator',
+              webSocketUrl: 'ws://192.168.1.49:4723/bidi/fbed26aa-e104-42fc-9f5e-b401dc6cc2bc'
+            }
+          }
+        }.to_json
+
+        stub_request(:post, 'http://127.0.0.1:4723/session')
+          .to_return(headers: HEADER, status: 200, body: response)
+
+        driver = core.start_driver
+
+        assert_requested(:post, 'http://127.0.0.1:4723/session', times: 1)
+        driver
+      end
+
+      capabilities = Caps.android[:capabilities]
+      capabilities['webSocketUrl'] = true
+
+      core = ::Appium::Core.for capabilities: capabilities
+      driver = android_mock_create_session_w3c_direct.call(core)
+
+      assert_equal driver.send(:bridge).class, Appium::Core::Base::BiDiBridge
+      assert_equal driver.instance_variable_get(:@wait_timeout), 30
+      assert !driver.send(:bridge).respond_to?(:driver)
+    end
+
     def test_elements
       driver = android_mock_create_session