fix parameterSet ByID compability with previous API versions (#482)

Author: mnieto

Source/Public/Get-VSTeamUserEntitlement.ps1

@@ -46,8 +46,8 @@ function Get-VSTeamUserEntitlement {
       # or supported version is not correct with the type of API call
       $paramCounter = _countParameters -BoundParameters $PSBoundParameters
 
-      $paramset = 'PagedParams', 'PagedFilter','ById'
-      if ($paramCounter -eq 0) {
+      $paramset = 'PagedParams', 'PagedFilter'
+      if ($paramCounter -eq 0 -or $PSCmdlet.ParameterSetName -eq 'ByID') {
          _supportsMemberEntitlementManagement
       } elseif ($paramset -contains $PSCmdlet.ParameterSetName) {
          _supportsMemberEntitlementManagement -Onwards '6.0'

Tests/function/tests/Get-VSTeamUserEntitlement.Tests.ps1

@@ -40,6 +40,17 @@ Describe "VSTeamUserEntitlement" -Tag 'VSTeamUserEntitlement' {
             }
          }
 
+         It 'by Id should return users with projects' {
+            $user = Get-VSTeamUserEntitlement -Id '00000000-0000-0000-0000-000000000000'
+
+            $user.Email | Should -Be 'test@test.com' -Because 'email is from type'
+            $user.userName | Should -Be 'Donovan Brown' -Because 'userName is from type'
+
+            Should -Invoke Invoke-RestMethod -Exactly -Times 1 -Scope It -ParameterFilter {
+               $Uri -eq "https://vsaex.dev.azure.com/test/_apis/userentitlements/00000000-0000-0000-0000-000000000000?api-version=$(_getApiVersion MemberEntitlementManagement)"
+            }
+         }
+
          Context 'Get-VSTeamUserEntitlement up to version 6.0' {
             BeforeAll {
                Mock _getApiVersion { return '1.0-unitTests' } -ParameterFilter { $Service -eq 'MemberEntitlementManagement' }
@@ -57,17 +68,6 @@ Describe "VSTeamUserEntitlement" -Tag 'VSTeamUserEntitlement' {
                }
             }
 
-            It 'by Id should return users with projects' {
-               $user = Get-VSTeamUserEntitlement -Id '00000000-0000-0000-0000-000000000000'
-   
-               $user.Email | Should -Be 'test@test.com' -Because 'email is from type'
-               $user.userName | Should -Be 'Donovan Brown' -Because 'userName is from type'
-   
-               Should -Invoke Invoke-RestMethod -Exactly -Times 1 -Scope It -ParameterFilter {
-                  $Uri -eq "https://vsaex.dev.azure.com/test/_apis/userentitlements/00000000-0000-0000-0000-000000000000?api-version=$(_getApiVersion MemberEntitlementManagement)"
-               }
-            }
-
             It 'with select for projects should return users with projects' {
                Get-VSTeamUserEntitlement -Select Projects
 
@@ -93,10 +93,6 @@ Describe "VSTeamUserEntitlement" -Tag 'VSTeamUserEntitlement' {
                }
             }
 
-            It 'should throw by ID and version 6.0 onwards' {
-               { Get-VSTeamUserEntitlement -Id '00000000-0000-0000-0000-000000000000' } | Should -Throw
-            }
-            
             It "with incorrect case in license parameter should throw" {
                { Get-VSTeamUserEntitlement -License account-Advanced} | Should -Throw
             }