fix: execute cdp for chrome session (#470)

* fix: execute cdp for chrome session

* remove comment

* add tests

* fix param

* move the definition for more wider usage

* tweak test case

* tweak test case

Author: KazuCocoa

lib/appium_lib_core/android/device.rb

@@ -302,6 +302,10 @@ module Device
         #   @driver.execute_cdp 'Page.captureScreenshot', quality: 50, format: 'jpeg'
         #   @driver.execute_cdp 'Page.getResourceTree'
         #
+        #   # for Ruby 2,7 and 3+ compatibility
+        #   params = {'timezoneId': 'Asia/Tokyo'}
+        #   driver.execute_cdp 'Emulation.setTimezoneOverride', **params
+        #
 
         ####
         ## class << self

lib/appium_lib_core/common/base/bridge.rb

@@ -357,6 +357,15 @@ def element_screenshot(element_id)
           execute :take_element_screenshot, id: element_id
         end
 
+        # for selenium-webdriver compatibility in chrome browser session.
+        # This may be needed in selenium-webdriver 4.8 or over? (around the version)
+        # when a session starts browserName: 'chrome' for bridge.
+        # This method is not only for Android, but also chrome desktop browser as well.
+        # So this bridge itself does not restrict the target module.
+        def send_command(command_params)
+          execute :chrome_send_command, {}, command_params
+        end
+
         private
 
         def unwrap_script_result(arg)

test/test_helper.rb

@@ -448,6 +448,36 @@ def android_mock_create_session_w3c
       driver
     end
 
+    def android_chrome_mock_create_session_w3c
+      response = {
+        value: {
+          sessionId: '1234567890',
+          capabilities: {
+            platformName: :android,
+            automationName: ENV['APPIUM_DRIVER'] || 'uiautomator2',
+            browserName: 'chrome',
+            platformVersion: '7.1.1',
+            deviceName: 'Android Emulator'
+          }
+        }
+      }.to_json
+
+      stub_request(:post, 'http://127.0.0.1:4723/wd/hub/session')
+        .with(headers: { 'X-Idempotency-Key' => /.+/ })
+        .to_return(headers: HEADER, status: 200, body: response)
+
+      stub_request(:post, "#{SESSION}/timeouts")
+        .with(body: { implicit: 5_000 }.to_json)
+        .to_return(headers: HEADER, status: 200, body: { value: nil }.to_json)
+
+      driver = @core.start_driver
+
+      assert_equal({}, driver.send(:bridge).http.additional_headers)
+      assert_requested(:post, 'http://127.0.0.1:4723/wd/hub/session', times: 1)
+      assert_requested(:post, "#{SESSION}/timeouts", body: { implicit: 5_000 }.to_json, times: 1)
+      driver
+    end
+
     def ios_mock_create_session
       ios_mock_create_session_w3c
     end

test/unit/android/device/w3c/execute_cdp_test.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'test_helper'
+require 'webmock/minitest'
+
+# $ rake test:unit TEST=test/unit/android/device/w3c/commands_test.rb
+class AppiumLibCoreTest
+  module Android
+    module Device
+      module W3C
+        class ExecuteCDPAndroidTest < Minitest::Test
+          include AppiumLibCoreTest::Mock
+          def test_execute_cdp
+            @core = ::Appium::Core.for(Caps.android)
+            @driver = android_mock_create_session_w3c
+
+            stub_request(:post, "#{SESSION}/goog/cdp/execute")
+              .with(body: { cmd: 'Page.captureScreenshot', params: { quality: 50, format: 'jpeg' } }.to_json)
+              .to_return(headers: HEADER, status: 200, body: { value: {} }.to_json)
+
+            @driver.execute_cdp 'Page.captureScreenshot', quality: 50, format: 'jpeg'
+
+            assert_requested(:post, "#{SESSION}/goog/cdp/execute", times: 1)
+          end
+        end
+
+        class ExecuteCDPChromeTest < Minitest::Test
+          include AppiumLibCoreTest::Mock
+          def test_execute_cdp_chrome
+            @core = ::Appium::Core.for(Caps.android)
+            @driver = android_chrome_mock_create_session_w3c
+
+            stub_request(:post, "#{SESSION}/goog/cdp/execute")
+              .with(body: { cmd: 'Emulation.setTimezoneOverride', params: { timezoneId: 'Asia/Tokyo' } }.to_json)
+              .to_return(headers: HEADER, status: 200, body: { value: {} }.to_json)
+
+            @driver.execute_cdp 'Emulation.setTimezoneOverride', 'timezoneId': 'Asia/Tokyo'
+
+            assert_requested(:post, "#{SESSION}/goog/cdp/execute", times: 1)
+          end
+        end
+      end # module W3C
+    end # module Device
+  end # module Android
+end # class AppiumLibCoreTest