Skip to content

Fix Tests from #4479 #4512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 2 commits into from
Aug 7, 2017
Merged

Fix Tests from #4479 #4512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2234b4
Fix Tests from PowerShell/PowerShell#4479
markekraus Aug 6, 2017
e6786ad
[Feature]
adityapatwardhan Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,27 +778,29 @@ Describe "Invoke-WebRequest tests" -Tags "Feature" {

It "Verifies Invoke-WebRequest default UserAgent handling with no errors" {
$UserAgent = [Microsoft.PowerShell.Commands.PSUserAgent]::InternetExplorer
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8081/PowerShell?test=echo" -UserAgent $UserAgent -Cmdlet "Invoke-WebRequest"
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8080/PowerShell?test=echo" -UserAgent $UserAgent -Cmdlet "Invoke-WebRequest"

$response.Error | Should BeNullOrEmpty
$response.Content.Headers.'User-Agent' | Should Match $UserAgent
$Pattern = [regex]::Escape($UserAgent)
$response.Content.UserAgent | Should Match $Pattern
}

It "Verifies Invoke-WebRequest default UserAgent handling reports an error is returned for an invalid UserAgent value" {
$UserAgent = 'Invalid:Agent'
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8081/PowerShell?test=echo" -UserAgent $UserAgent -Cmdlet "Invoke-WebRequest"
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8080/PowerShell?test=echo" -UserAgent $UserAgent -Cmdlet "Invoke-WebRequest"

$response.Error | Should Not BeNullOrEmpty
$response.Error.FullyQualifiedErrorId | Should Be "System.FormatException,Microsoft.PowerShell.Commands.InvokeRestMethodCommand"
$response.Error.FullyQualifiedErrorId | Should Be "System.FormatException,Microsoft.PowerShell.Commands.InvokeWebRequestCommand"
$response.Error.Exception.Message | Should Be "The format of value 'Invalid:Agent' is invalid."
}

It "Verifies Invoke-WebRequest UserAgent handling does not report an error when using -SkipHeaderValidation" {
$UserAgent = 'Invalid:Agent'
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8081/PowerShell?test=echo" -UserAgent $UserAgent -SkipHeaderValidation -Cmdlet "Invoke-WebRequest"
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8080/PowerShell?test=echo" -UserAgent $UserAgent -SkipHeaderValidation -Cmdlet "Invoke-WebRequest"

$response.Error | Should BeNullOrEmpty
$response.Content.Headers.'User-Agent' | Should Match $UserAgent
$Pattern = [regex]::Escape($UserAgent)
$response.Content.UserAgent | Should Match $Pattern
}

#endregion SkipHeaderVerification Tests
Expand Down Expand Up @@ -1297,7 +1299,8 @@ Describe "Invoke-RestMethod tests" -Tags "Feature" {
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8081/PowerShell?test=echo" -UserAgent $UserAgent -Cmdlet "Invoke-RestMethod"

$response.Error | Should BeNullOrEmpty
$response.Content.Headers.'User-Agent' | Should Match $UserAgent
$Pattern = [regex]::Escape($UserAgent)
$response.Content.UserAgent | Should Match $Pattern
}

It "Verifies Invoke-RestMethod default UserAgent handling reports an error is returned for an invalid UserAgent value" {
Expand All @@ -1314,7 +1317,8 @@ Describe "Invoke-RestMethod tests" -Tags "Feature" {
$response = ExecuteRequestWithCustomUserAgent -Uri "http://localhost:8081/PowerShell?test=echo" -UserAgent $UserAgent -SkipHeaderValidation -Cmdlet "Invoke-RestMethod"

$response.Error | Should BeNullOrEmpty
$response.Content.Headers.'User-Agent' | Should Match $UserAgent
$Pattern = [regex]::Escape($UserAgent)
$response.Content.UserAgent | Should Match $Pattern
}

#endregion SkipHeaderVerification tests
Expand Down