Skip to content

Commit cd263a6

Browse files
[Windows] Use function to get selenium asset url
1 parent 038cb56 commit cd263a6

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

images/win/scripts/Installers/Install-IEWebDriver.ps1

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
## Desc: Install Selenium Web Drivers
44
################################################################################
55

6-
7-
$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100"
8-
$ieDriverUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*IEDriverServer_x64_*.zip" } | Select-Object -First 1
6+
$seleniumMajorVersion = (Get-ToolsetContent).selenium.version
7+
$ieDriverUrl = Get-GitHubPackageDownloadUrl `
8+
-RepoOwner "SeleniumHQ" `
9+
-RepoName "selenium" `
10+
-BinaryName "IEDriverServer_x64" `
11+
-Version $seleniumMajorVersion `
12+
-UrlFilter "*{BinaryName}_{Version}.zip"
913

1014
# Download IE selenium driver
1115
try {
1216
Write-Host "Selenium IEDriverServer download and install..."
1317
$driverZipFile = Start-DownloadWithRetry -Url $ieDriverUrl -Name "SeleniumWebDrivers.zip"
14-
}
15-
catch {
18+
} catch {
1619
Write-Error "[!] Failed to download $ieDriverUrl"
1720
exit 1
1821
}
@@ -31,4 +34,4 @@ Write-Host "Get the IEDriver version..."
3134
Write-Host "Setting the IEWebDriver environment variables"
3235
setx IEWebDriver $ieDriverPath /M
3336

34-
Invoke-PesterTests -TestFile "Browsers" -TestName "Internet Explorer"
37+
Invoke-PesterTests -TestFile "Browsers" -TestName "Internet Explorer"

images/win/scripts/Installers/Install-Selenium.ps1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ New-Item -ItemType directory -Path $seleniumDirectory
1111
$seleniumMajorVersion = (Get-ToolsetContent).selenium.version
1212
$seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name
1313
$seleniumFileName = "$seleniumBinaryName.jar"
14-
$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100"
15-
$seleniumDownloadUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*${seleniumBinaryName}-${seleniumMajorVersion}.*jar" } | Select-Object -First 1
14+
15+
$seleniumDownloadUrl = Get-GitHubPackageDownloadUrl `
16+
-RepoOwner "SeleniumHQ" `
17+
-RepoName "selenium" `
18+
-BinaryName "$seleniumBinaryName" `
19+
-Version $seleniumMajorVersion `
20+
-UrlFilter "*{BinaryName}_{Version}.jar"
1621

1722
Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory
1823

0 commit comments

Comments
 (0)