From 621826b6569e50322f2d5c0e46f2b824407aec55 Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Fri, 31 Jan 2020 10:43:55 +0300 Subject: [PATCH] Install Microsoft Edge and related web drivers on Windows (#338) Co-authored-by: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> --- images/win/Windows2016-Azure.json | 12 +++++ images/win/Windows2019-Azure.json | 12 +++++ .../win/scripts/Installers/Install-Edge.ps1 | 6 +++ .../Installers/Install-SeleniumWebDrivers.ps1 | 35 +++++++++++-- .../win/scripts/Installers/Validate-Edge.ps1 | 25 ++++++++++ .../Validate-SeleniumWebDrivers.ps1 | 50 +++++++++++++------ 6 files changed, 120 insertions(+), 20 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Edge.ps1 create mode 100644 images/win/scripts/Installers/Validate-Edge.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 375bab0a6..98d96feb9 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -354,6 +354,12 @@ "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -655,6 +661,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c8acc4b5c..1b411672e 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -323,6 +323,12 @@ "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -624,6 +630,12 @@ "{{ template_dir }}/scripts/Installers/Validate-Chrome.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Edge.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 new file mode 100644 index 000000000..e5a641a1b --- /dev/null +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Edge.ps1 +## Desc: Install latest stable version of Microsoft Edge browser +################################################################################ + +choco install microsoft-edge -y diff --git a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 index 1ea4fa84d..426c20b5b 100644 --- a/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Install-SeleniumWebDrivers.ps1 @@ -21,7 +21,9 @@ $ChromeDriverPath = "$DestinationPath\SeleniumWebDrivers\ChromeDriver"; Write-Host "Chrome driver path: [$ChromeDriverPath]"; Remove-Item -Path "$ChromeDriverPath\*" -Force; -$ChromePath = (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe').'(default)'; +# Reinstall Chrome Web Driver +$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" +$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)'; [version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion; Write-Host "Chrome version: [$ChromeVersion]"; @@ -44,16 +46,39 @@ Write-Host "Chrome driver install...."; Expand-Archive -Path "$ChromeDriverPath\chromedriver_win32.zip" -DestinationPath $ChromeDriverPath -Force; Remove-Item -Path "$ChromeDriverPath\chromedriver_win32.zip" -Force; -Write-Host "Setting the environment variables"; +# Install Microsoft Edge Web Driver +Write-Host "Microsoft Edge driver download...." +$EdgeDriverPath = "$DestinationPath\SeleniumWebDrivers\EdgeDriver" +if (-not (Test-Path -Path $EdgeDriverPath)) { + New-Item -Path $EdgeDriverPath -ItemType "directory" +} + +$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' +[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion +$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" +$EdgeDriverVersionFile = "$EdgeDriverPath\versioninfo.txt" +Invoke-WebRequest -Uri $EdgeDriverVersionUrl -OutFile $EdgeDriverVersionFile + +$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile +$EdgeDriverDownloadUrl="https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/edgedriver_win64.zip" +$DestFile = "$EdgeDriverPath\edgedriver_win64.zip" +Invoke-WebRequest -Uri $EdgeDriverDownloadUrl -OutFile $DestFile + +Write-Host "Microsoft Edge driver install...." +Expand-Archive -Path $DestFile -DestinationPath $EdgeDriverPath -Force +Remove-Item -Path $DestFile -Force + +Write-Host "Setting the environment variables" setx IEWebDriver "C:\SeleniumWebDrivers\IEDriver" /M; setx GeckoWebDriver "C:\SeleniumWebDrivers\GeckoDriver" /M; -setx ChromeWebDriver "C:\SeleniumWebDrivers\ChromeDriver" /M; +setx ChromeWebDriver "$ChromeDriverPath" /M; +setx EdgeWebDriver "$EdgeDriverPath" /M; $regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'; $PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'; -$PathValue += ";C:\SeleniumWebDrivers\ChromeDriver\"; +$PathValue += ";$ChromeDriverPath\"; +$PathValue += ";$EdgeDriverPath\"; Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue; exit 0; - diff --git a/images/win/scripts/Installers/Validate-Edge.ps1 b/images/win/scripts/Installers/Validate-Edge.ps1 new file mode 100644 index 000000000..7ca51da59 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Edge.ps1 @@ -0,0 +1,25 @@ +################################################################################ +## File: Validate-Edge.ps1 +## Desc: Validate Microsoft Edge installation. +################################################################################ + +$RegistryKey = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe" +if (Test-Path $RegistryKey) +{ + $SoftwareName = "Microsoft Edge" + $VersionInfo = (Get-Item (Get-ItemProperty $RegistryKey).'(Default)').VersionInfo + $VersionInfo + $Description = @" +_version:_ +$($VersionInfo.FileVersion) +"@ + + Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + + exit 0 +} +else +{ + Write-Host "Microsoft Edge is not installed." + exit 1 +} diff --git a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 index 44c69ef2e..9a68c72bd 100644 --- a/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 +++ b/images/win/scripts/Installers/Validate-SeleniumWebDrivers.ps1 @@ -6,24 +6,36 @@ $IEDriverPath = $env:IEWebDriver $GeckoDriverPath = $env:GeckoWebDriver $ChromeDriverPath = $env:ChromeWebDriver +$EdgeDriverPath = $env:EdgeWebDriver + +if ( + ($IEDriverPath -like "C:\SeleniumWebDrivers\IEDriver") -and + ($GeckoDriverPath -like "C:\SeleniumWebDrivers\GeckoDriver") -and + ($ChromeDriverPath -like "C:\SeleniumWebDrivers\ChromeDriver") -and + ($EdgeDriverPath -like "C:\SeleniumWebDrivers\EdgeDriver") +) +{ -if(($IEDriverPath -like "C:\SeleniumWebDrivers\IEDriver") -and ($GeckoDriverPath -like "C:\SeleniumWebDrivers\GeckoDriver") -and ($ChromeDriverPath -like "C:\SeleniumWebDrivers\ChromeDriver")) -{ - Write-Host "IEDriver installed at " - (Get-Item "C:\SeleniumWebDrivers\IEDriver\IEDriverServer.exe").VersionInfo - - + (Get-Item "$IEDriverPath\IEDriverServer.exe").VersionInfo + + Write-Host "Gecko Driver installed at " - (Get-Item "C:\SeleniumWebDrivers\GeckoDriver\geckodriver.exe").VersionInfo - - + (Get-Item "$GeckoDriverPath\geckodriver.exe").VersionInfo + + Write-Host "Chrome Driver installed at " - (Get-Item "C:\SeleniumWebDrivers\ChromeDriver\chromedriver.exe").VersionInfo - - $chromedriverversion = Get-Content -Path "C:\SeleniumWebDrivers\ChromeDriver\versioninfo.txt" - $geckodriverversion = Get-Content -Path "C:\SeleniumWebDrivers\GeckoDriver\versioninfo.txt" - $iedriverversion = Get-Content -Path "C:\SeleniumWebDrivers\IEDriver\versioninfo.txt" + (Get-Item "$ChromeDriverPath\chromedriver.exe").VersionInfo + + + Write-Host "Edge Driver installed at " + (Get-Item "$EdgeDriverPath\msedgedriver.exe").VersionInfo + + $versionFileName = "versioninfo.txt"; + $chromedriverversion = Get-Content -Path "$IEDriverPath\$versionFileName" + $geckodriverversion = Get-Content -Path "$GeckoDriverPath\$versionFileName" + $iedriverversion = Get-Content -Path "$ChromeDriverPath\$versionFileName" + $edgedriverversion = Get-Content -Path "$EdgeDriverPath\$versionFileName" # Adding description of the software to Markdown $SoftwareName = "Selenium Web Drivers" @@ -54,10 +66,18 @@ $iedriverversion _Environment:_ * IEWebDriver: location of IEDriverServer.exe +#### Microsoft Edge Driver + +_version:_ +$edgedriverversion + +_Environment:_ +* EdgeWebDriver: location of msedgedriver.exe + "@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description - + exit 0 } else