Tests for single user ID input added

teamviewer · Jul 20, 2023 · a0442bf · a0442bf
1 parent 67b6ea0
commit a0442bf
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/TeamViewerPS/Private/Resolve-TeamViewerUserGroupMemberId.ps1 b/TeamViewerPS/Private/Resolve-TeamViewerUserGroupMemberId.ps1
@@ -11,6 +11,9 @@ function Resolve-TeamViewerUserGroupMemberMemberId {
         elseif ($UserGroupMember -match 'u[0-9]+') {
             return $UserGroupMember
         }
+        elseif ($UserGroupMember -is [string]) {
+            return [int]$UserGroupMember
+        }
         elseif ($UserGroupMember -is [int]) {
             return $UserGroupMember
         }

diff --git a/TeamViewerPS/TeamViewerPS.psd1 b/TeamViewerPS/TeamViewerPS.psd1
@@ -3,7 +3,7 @@
     RootModule        = 'TeamViewerPS.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.5.0'
+    ModuleVersion     = '1.5.1'
 
     # Supported PSEditions.
     # CompatiblePSEditions = @()

diff --git a/Tests/Public/Add-TeamViewerUserGroupMember.Tests.ps1 b/Tests/Public/Add-TeamViewerUserGroupMember.Tests.ps1
@@ -8,6 +8,8 @@ BeforeAll {
     $null = $testApiToken
     $testMembers = @(123, 456, 789)
     $null = $testMembers
+    $testMemberWithU = @('u101')
+    $null = $testMemberWithU
     $testUserGroupId = 1001
     $null = $testUserGroupId
 
@@ -24,8 +26,8 @@ Describe 'Add-TeamViewerUserGroupMember' {
             -Member $testMembers
         Assert-MockCalled Invoke-TeamViewerRestMethod -Times 1 -Scope It -ParameterFilter {
             $ApiToken -eq $testApiToken -And `
-            $Uri -eq "//unit.test/usergroups/$testUserGroupId/members" -And `
-            $Method -eq 'Post' }
+                $Uri -eq "//unit.test/usergroups/$testUserGroupId/members" -And `
+                $Method -eq 'Post' }
     }
 
     It 'Should handle domain object as input' {
@@ -36,8 +38,19 @@ Describe 'Add-TeamViewerUserGroupMember' {
             -Member $testMembers
         Assert-MockCalled Invoke-TeamViewerRestMethod -Times 1 -Scope It -ParameterFilter {
             $ApiToken -eq $testApiToken -And `
-            $Uri -eq "//unit.test/usergroups/$testUserGroupId/members" -And `
-            $Method -eq 'Post' }
+                $Uri -eq "//unit.test/usergroups/$testUserGroupId/members" -And `
+                $Method -eq 'Post' }
+    }
+
+    It 'Should add a single member to the user group with format u[0-9]+' {
+        Add-TeamViewerUserGroupMember `
+            -ApiToken $testApiToken `
+            -UserGroup $testUserGroupId `
+            -Member $testMemberWithU
+        $mockArgs.Body | Should -Not -BeNullOrEmpty
+        $body = [System.Text.Encoding]::UTF8.GetString($mockArgs.Body) | ConvertFrom-Json
+        $body | Should -HaveCount 1
+        $body | Should -Contain $testMemberWithU.trim('u')
     }
 
     It 'Should add the given members to the user group' {

diff --git a/Tests/Public/Remove-TeamViewerUserGroupMember.Tests.ps1 b/Tests/Public/Remove-TeamViewerUserGroupMember.Tests.ps1
@@ -7,6 +7,8 @@ BeforeAll {
     $testApiToken = [securestring]@{}
     $null = $testApiToken
     $testMembers = @(123, 456, 789)
+    $testMemberId = @('u101')
+    $null = $testMemberId
     $testUserGroupMembers = @(
         @{AccountId = $testMembers[0]; Name = 'test account 1' }
         @{AccountId = $testMembers[1]; Name = 'test account 2' }
@@ -25,7 +27,7 @@ BeforeAll {
 
 Describe 'Remove-TeamViewerUserGroupMember' {
 
-    Context 'Should bulk remove members ByUserGroupMemberId' {
+    Context 'Should  remove members ByUserGroupMember' {
 
         It 'Should call the correct API endpoint' {
             Remove-TeamViewerUserGroupMember `
@@ -38,6 +40,17 @@ Describe 'Remove-TeamViewerUserGroupMember' {
                     $Method -eq 'Delete' }
         }
 
+        It 'Should remove a single user from the user group' {
+            Remove-TeamViewerUserGroupMember `
+                -ApiToken $testApiToken `
+                -UserGroup $testUserGroupId `
+                -UserGroupMember $testMemberId
+            $mockArgs.Body | Should -Not -BeNullOrEmpty
+            $body = [System.Text.Encoding]::UTF8.GetString($mockArgs.Body) | ConvertFrom-Json
+            $body | Should -HaveCount 1
+            $body | Should -Contain $testMemberId.trim('u')
+        }
+
         It 'Should handle domain object as input' {
             $testUserGroup = @{Id = $testUserGroupId; Name = 'test user group' } | ConvertTo-TeamViewerUserGroup
             Remove-TeamViewerUserGroupMember `