From e5a431b783fdf4adb70adaed5867da01bef2f2ed Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Tue, 17 Sep 2024 08:19:59 +0200
Subject: [PATCH] feat: Bump appium-chromedriver

---
 .github/workflows/functional-test.yml | 15 ++++++---------
 README.md                             | 16 ++++++----------
 package.json                          |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index 433bb05a9..935e80607 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -18,20 +18,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - chromedriverVersion: "113.0.5672.63"
-          apiLevel: 32
+        - apiLevel: 32
           emuTag: google_apis
           arch: x86_64
-        - chromedriverVersion: "83.0.4103.39"
-          apiLevel: 30
+        - apiLevel: 30
           emuTag: google_apis
           arch: x86
-        - chromedriverVersion: "2.44"
-          apiLevel: 28
+        - apiLevel: 28
           emuTag: default
           arch: x86
-        - chromedriverVersion: "2.20"
-          apiLevel: 23
+        - apiLevel: 23
           emuTag: default
           arch: x86
 
@@ -93,7 +89,7 @@ jobs:
         cwd=$(pwd)
         pushd "$cwd"
         cd ~
-        CHROMEDRIVER_VERSION="${{ matrix.chromedriverVersion }}" appium driver install --source=local "$cwd"
+        appium driver install --source=local "$cwd"
         appium driver doctor uiautomator2
         nohup appium server \
           --port=$APPIUM_TEST_SERVER_PORT \
@@ -101,6 +97,7 @@ jobs:
           --relaxed-security \
           --log-no-colors \
           --log-timestamp \
+          --allow-insecure chromedriver_autodownload \
           2>&1 > "$cwd/appium.log" &
         popd
       name: Start Appium server
diff --git a/README.md b/README.md
index d7c7af6a6..ae9cd24f2 100644
--- a/README.md
+++ b/README.md
@@ -1683,6 +1683,8 @@ There are several ways to provide a customized Chromedriver to UIA2 driver:
 
 #### When installing the driver
 
+_Note_: This only works for driver versions below 3.8.0
+
 Specify the Chromedriver version in the `CHROMEDRIVER_VERSION` environment variable:
 
 ```bash
@@ -1744,19 +1746,13 @@ There is a possibility to automatically download the necessary chromedriver(s) i
 
 ### Troubleshooting Chromedriver Download Issues
 
-When UIA2 driver is installed it automatically downloads Chromedriver, so there is a possibility
-of network or other issues leading to an installation failure.
-
-By default, Chromedriver is retrieved from `https://chromedriver.storage.googleapis.com/`.
-To use a mirror of the above URL change the value of `CHROMEDRIVER_CDNURL` environemnt variable:
-
-```bash
-CHROMEDRIVER_CDNURL=https://npmmirror.com/mirrors/chromedriver appium driver install uiautomator2
-```
+Check the [Custom binaries url](https://github.com/appium/appium-chromedriver?tab=readme-ov-file#custom-binaries-url)
+section of appium-chromedriver README for more details on how to customize the download CDN.
 
 It may also be necessary to adjust network proxy and firewall settings for the above to work.
 
-In case you would like skip the download of Chromedriver entirely, do it by
+Ig you use a UIA2 driver below version 3.8.0, and you
+would like skip the automated download of Chromedriver upon driver install, do it by
 defining the `APPIUM_SKIP_CHROMEDRIVER_INSTALL` environment variable:
 
 ```bash
diff --git a/package.json b/package.json
index 5d25e9ada..8b2156c40 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
   "dependencies": {
     "appium-adb": "^12.5.2",
     "appium-android-driver": "^9.10.1",
-    "appium-chromedriver": "^5.6.28",
+    "appium-chromedriver": "^6.0.1",
     "appium-uiautomator2-server": "^7.0.24",
     "asyncbox": "^3.0.0",
     "axios": "^1.6.5",