Splitted up functionality to Get-JenkinsUserInfo, and Get-JenkinsUserFullName.

Author: lee-at-work

Diff for: Private/Get-JenkinsUserInfo.ps1

@@ -0,0 +1,19 @@
+function Get-JenkinsUserInfo {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory=$true)]
+        [string] $Username
+    )
+
+    if (!$script:AllUserInfo) {
+        $script:AllUserInfo = [hashtable]::new()
+    }
+
+    if ($userInfo = $AllUserInfo[$Username]) {
+        return $userInfo
+    } else {
+        $response = Invoke-JenkinsRequest -Resource "/user/me/api/json"
+        $script:AllUserInfo[$Username] = $response.Content
+        return $AlluserInfo[$Username]
+    }
+}

Diff for: Public/Get-JenkinsUserFullName.ps1

@@ -1,21 +1,13 @@
+. "$PSScriptRoot\..\Private\Get-JenkinsUserInfo.ps1"
+
 function Get-JenkinsUserFullName {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory=$true)]
-        [string] $Username,
-        [Parameter(Mandatory=$true)]
-        [securestring] $Password
+        [string] $Username
     )
 
-    if (!$script:fullNamesByUser) {
-        $script:fullNamesByUser = [hashtable]::new()
-    }
-
-    if ($fullName = $fullNamesByUser[$Username]) {
-        return $fullName
-    } else {
-        $response = Invoke-JenkinsRequest -Resource "/user/me/api/json"
-        $script:fullNamesByUser[$Username] = $response.Content.fullName
-        return $fullNamesByUser[$Username]
-    }
+    $userInfo = Get-JenkinsUserInfo -Username $Username
+    $fullName = if ($null -ne $userInfo) { $userInfo.fullName } else { $null }
+    return $fullName
 }

Diff for: Tests/Get-JenkinsUserFullName.Test.ps1

@@ -1,10 +1,11 @@
-Import-Module "$PSScriptRoot\..\ThreeShape.Jenkins.Beta.psm1" -Force
+Import-Module -Name (Get-ChildItem $PSScriptRoot\..\*.psm1 | Select-Object -first 1).FullName -Force
 . "$PSScriptRoot\..\Public\Get-JenkinsUserFullName.ps1"
+. "$PSScriptRoot\..\Private\Get-JenkinsUserInfo.ps1"
 
 Describe 'Get-JenkinsUserFullName method' {
 
     AfterEach {
-        $script:fullNamesByUser = $null
+        $script:AllUserInfo = $null
     }
 
     $Fullname1 = "Robot"
@@ -46,19 +47,17 @@ Describe 'Get-JenkinsUserFullName method' {
 
         It 'Retrieves the fullname of the user' {
             $user = $UserInfo1.id
-            $pass = "changeme"  | ConvertTo-SecureString -AsPlainText -Force
 
-            Mock -CommandName Invoke-JenkinsRequest { return @{Content = $UserInfo1 } } -Verifiable
-            $fullName = Get-JenkinsUserFullName -UserName $user -Password $pass
+            Mock -CommandName Get-JenkinsUserInfo { return $UserInfo1 } -Verifiable
+            $fullName = Get-JenkinsUserFullName -UserName $user
             $fullName | Should -BeExactly $Fullname1
         }
 
         It 'It is looked up, cached and re-used' {
             $user = $UserInfo2.id
-            $pass = "changeme" | ConvertTo-SecureString -AsPlainText -Force
 
-            Mock -CommandName Invoke-JenkinsRequest { return @{Content = $UserInfo2 } } -Verifiable
-            $fullName = Get-JenkinsUserFullName -UserName $user -Password $pass
+            Mock -CommandName Get-JenkinsUserInfo { return $UserInfo2 } -Verifiable
+            $fullName = Get-JenkinsUserFullName -UserName $user
             $fullName | Should -BeExactly $Fullname2
         }
     }
@@ -67,11 +66,10 @@ Describe 'Get-JenkinsUserFullName method' {
 
         It 'Requests for fullname, then looked up from cache subsequently' {
             $user = $UserInfo1.id
-            $pass = "changeme" | ConvertTo-SecureString -AsPlainText -Force
 
             Mock -CommandName Invoke-JenkinsRequest { return @{Content = $UserInfo1 } } -Verifiable
-            Get-JenkinsUserFullName -UserName $user -Password $pass
-            Get-JenkinsUserFullName -UserName $user -Password $pass
+            Get-JenkinsUserFullName -UserName $user
+            Get-JenkinsUserFullName -UserName $user
             Assert-MockCalled -CommandName Invoke-JenkinsRequest -Exactly 1
         }
     }
@@ -81,13 +79,14 @@ Describe 'Get-JenkinsUserFullName method' {
         It 'Requests for fullname, then looked up from cache subsequently' {
             $user1 = $UserInfo1.id
             $user2 = $UserInfo2.id
-            $pass = "changeme" | ConvertTo-SecureString -AsPlainText -Force
 
+            #Mock -CommandName Get-JenkinsUserInfo { return $UserInfo1 } -Verifiable
             Mock -CommandName Invoke-JenkinsRequest { return @{Content = $UserInfo1 } } -Verifiable
-            $name1 = Get-JenkinsUserFullName -UserName $user1 -Password $pass
+            $name1 = Get-JenkinsUserFullName -UserName $user1
+            #Mock -CommandName Get-JenkinsUserInfo { return $UserInfo2 } -Verifiable
             Mock -CommandName Invoke-JenkinsRequest { return @{Content = $UserInfo2 } } -Verifiable
-            $name2 = Get-JenkinsUserFullName -UserName $user2 -Password $pass
-            $name3 = Get-JenkinsUserFullName -UserName $user2 -Password $pass
+            $name2 = Get-JenkinsUserFullName -UserName $user2
+            $name3 = Get-JenkinsUserFullName -UserName $user2
 
             $name1 | Should -Be $Fullname1
             $name2 | Should -Be $Fullname2