From 47a60e077673c6caa771c23697dc851e4c86caa0 Mon Sep 17 00:00:00 2001
From: Dibir Magomedsaygitov
 <61747324+dibir-magomedsaygitov@users.noreply.github.com>
Date: Thu, 11 Nov 2021 18:21:51 +0300
Subject: [PATCH] [Windows] Upgrade Selenium server version from 3 to 4 (#4473)

---
 images/win/scripts/Tests/Browsers.Tests.ps1 | 11 ++++++-----
 images/win/toolsets/toolset-2016.json       |  4 ++--
 images/win/toolsets/toolset-2019.json       |  4 ++--
 images/win/toolsets/toolset-2022.json       |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/win/scripts/Tests/Browsers.Tests.ps1
index b1b4a760..89fd9b5e 100644
--- a/images/win/scripts/Tests/Browsers.Tests.ps1
+++ b/images/win/scripts/Tests/Browsers.Tests.ps1
@@ -139,15 +139,16 @@ Describe "Internet Explorer" {
 }
 
 Describe "Selenium" {
-    It "Selenium 'C:\selenium' path exists" {
-        "C:\selenium" | Should -Exist
+    BeforeAll {
+        $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name
+        $seleniumBinPath = Join-Path "C:\selenium\" "$seleniumBinaryName.jar"
     }
 
-    It "Selenium Server 'selenium-server-standalone.jar' is installed" {
-        "C:\selenium\selenium-server-standalone.jar" | Should -Exist
+    It "Selenium server is installed" {
+        $seleniumBinPath | Should -Exist
     }
 
     It "SELENIUM_JAR_PATH environment variable exists" {
-        Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "C:\selenium\selenium-server-standalone.jar"
+        Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "$seleniumBinPath"
     }
 }
\ No newline at end of file
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index e914d7e9..49141ca6 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -362,8 +362,8 @@
         }
     ],
     "selenium": {
-        "version": "3",
-        "binary_name": "selenium-server-standalone"
+        "version": "4",
+        "binary_name": "selenium-server"
     },
     "npm": {
         "global_packages": [
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 70bb9256..2726268d 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -394,8 +394,8 @@
         }
     ],
     "selenium": {
-        "version": "3",
-        "binary_name": "selenium-server-standalone"
+        "version": "4",
+        "binary_name": "selenium-server"
     },
     "npm": {
         "global_packages": [
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index f0dd0b82..d7c19905 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -256,8 +256,8 @@
         }
     ],
     "selenium": {
-        "version": "3",
-        "binary_name": "selenium-server-standalone"
+        "version": "4",
+        "binary_name": "selenium-server"
     },
     "npm": {
         "global_packages": [