adds parameter sets to web cmdlets to allow for standard and non-stan…

test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1

@@ -400,21 +400,33 @@ Describe "Invoke-WebRequest tests" -Tags "Feature" {
         $result.Error | Should BeNullOrEmpty
     }
 
-    It "Validate StandardMethod and CustomMethod parameter sets" {
+    It "Validate Invoke-WebRequest StandardMethod and CustomMethod parameter sets" {
 
         #Validate that parameter sets are functioning correctly
-        $command = "Invoke-RestMethod -Uri 'http://sandbox.lee.io/method.php' -Method GET -CustomMethod 'TEST'"
-        $result = ExecuteWebCommand -command $command
-        $result.Error | Should Not BeNullOrEmpty
+        $errorId = "AmbiguousParameterSet,Microsoft.PowerShell.Commands.InvokeWebRequestCommand"
+        { Invoke-WebRequest -Uri 'http://http.lee.io/method' -Method GET -CustomMethod TEST } | ShouldBeErrorId $errorId
     }
 
-    It "Validate CustomMethod parameter set method is passed" {
+    It "Validate Invoke-WebRequest CustomMethod method is used" {
 
-        #Validate that custom method is used
-        $command = "Invoke-RestMethod -Uri 'http://http.lee.io/method' -CustomMethod 'TEST'"
+        $command = "Invoke-WebRequest -Uri 'http://http.lee.io/method' -CustomMethod TEST"
         $result = ExecuteWebCommand -command $command
         $result.Error | Should BeNullOrEmpty
-        $result.output.method | Should Be "TEST"
+        ($result.Output.Content | ConvertFrom-Json).output.method | Should Be "TEST"
+    }
+
+    It "Validate Invoke-WebRequest default ContentType for CustomMethod POST" {
+
+        $command = "Invoke-WebRequest -Uri 'http://httpbin.org/post' -CustomMethod POST -Body 'testparam=testvalue'"
+        $result = ExecuteWebCommand -command $command
+        ($result.Output.Content | ConvertFrom-Json).headers.'Content-Type' | Should Be "application/x-www-form-urlencoded"
+    }
+
+    It "Validate Invoke-WebRequest body is converted to query params for CustomMethod GET" {
+
+        $command = "Invoke-WebRequest -Uri 'http://httpbin.org/get' -Method GET -Body @{'testparam'='testvalue'}"
+        $result = ExecuteWebCommand -command $command
+        ($result.Output.Content | ConvertFrom-Json).args.testparam | Should Be "testvalue"
     }
 
     It "Validate Invoke-WebRequest returns HTTP errors in exception" {
@@ -666,6 +678,34 @@ Describe "Invoke-RestMethod tests" -Tags "Feature" {
         $result.Error | Should BeNullOrEmpty
     }
 
+    It "Validate Invoke-RestMethod StandardMethod and CustomMethod parameter sets" {
+
+        $errorId = "AmbiguousParameterSet,Microsoft.PowerShell.Commands.InvokeRestMethodCommand"
+        { Invoke-RestMethod -Uri 'http://http.lee.io/method' -Method GET -CustomMethod TEST } | ShouldBeErrorId $errorId
+    }
+
+    It "Validate CustomMethod method is used" {
+
+        $command = "Invoke-RestMethod -Uri 'http://http.lee.io/method' -CustomMethod TEST"
+        $result = ExecuteWebCommand -command $command
+        $result.Error | Should BeNullOrEmpty
+        $result.Output.output.method | Should Be "TEST"
+    }
+
+    It "Validate Invoke-RestMethod default ContentType for CustomMethod POST" {
+
+        $command = "Invoke-RestMethod -Uri 'http://httpbin.org/post' -CustomMethod POST -Body 'testparam=testvalue'"
+        $result = ExecuteWebCommand -command $command
+        $result.Output.headers.'Content-Type' | Should Be "application/x-www-form-urlencoded"
+    }
+
+    It "Validate Invoke-RestMethod body is converted to query params for CustomMethod GET" {
+
+        $command = "Invoke-RestMethod -Uri 'http://httpbin.org/get' -Method GET -Body @{'testparam'='testvalue'}"
+        $result = ExecuteWebCommand -command $command
+        $result.Output.args.testparam | Should Be "testvalue"
+    }
+
     It "Invoke-RestMethod supports request that returns plain text response." {
 
         $command = "Invoke-RestMethod -Uri 'http://httpbin.org/encoding/utf8'"